Re: git branch command is incompatible with bash

2015-07-28 Thread Scott Schmit
h, sometimes a tag, and sometimes a commit hash. We don't have a one-stop-shop command to answer that question in all cases, which is unfortunate. git status answers, but that's not plumbing. git-prompt manages to do a fairly good job, but the logic is by no means straightforward. -- Sco

Re: [PATCH v6 17/19] fsck: Introduce `git fsck --quick`

2015-06-19 Thread Scott Schmit
is a very good name that > is unfortunately a mouthful, I agree that we need a name that is as > short as `--x` that means the same as `--connectivity-only`. I > do not think `--quick` is that word; it does not mean such a thing. How about `--linkage` or `--links`? -- Scott Schmit

Re: [PATCH] git-checkout.txt: Document "git checkout " better

2015-06-11 Thread Scott Schmit
ches, but we've chosen not to. (I then waste time trying to understand that) s/commit/commit-ish/ - tags are also tree-ishes, though you could argue this case is less "often" leaving: 'git checkout' with or `--patch` is used to restore modified or deleted paths to their original contents from the index or replace paths with the contents from a named (most often a commit-ish) instead of switching branches. does a sha1 count as "named"? Maybe s/named //. -- Scott Schmit -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-20 Thread Scott Schmit
eakage at say 5 would > not explain why the tip of the upper branch is broken---its breakage > has no way to propagate there. The breakage must have happened at 4 > or before that commit. But what if 7 & 8 are the same patch, cherry-picked? Or nearly the same patch, but with

[BUG] Move tracking in git diff is not as good as in git status

2015-02-04 Thread Scott Schmit
ff -M --stat --summary HEAD~.. git diff -C --stat --summary HEAD~.. --- At first, I thought it was because the "git mv" command recorded something in the index that's lost once the commit happens. To check if that was so, I went back to the commit in question, did a "git reset

Re: [PATCH] branch: add support for --dry-run option

2015-01-21 Thread Scott Schmit
delete the branch 'a' which you are currently on. $ touch file $ git add file $ git commit -m 'add file' [a e2c2ece] add file 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 file $ git checkout -b b master Switched to a new branch 'b' $ git branch -d a error: The branch 'a' is not fully merged. If you are sure you want to delete it, run 'git branch -D a'. -- Scott Schmit smime.p7s Description: S/MIME cryptographic signature

Re: [PATCH] stash: git stash create and git stash store added to git stash usage synopsys

2015-01-13 Thread Scott Schmit
$dashless clear > + or: $dashless create [] > + or: $dashless store [-m|--message ] [-q|--quiet] " > > SUBDIRECTORY_OK=Yes > OPTIONS_SPEC= Considering the man page says create & store are intended for scripts and "probably not the command you want to use"

Re: [PATCH] standardize usage info string format

2015-01-12 Thread Scott Schmit
-cc]" (which I admit seems counter-intuitive), but I wouldn't be surprised if opinions on that are about as split as the existing usage lines are :-). Hope this helps. -- Scott Schmit smime.p7s Description: S/MIME cryptographic signature

Re: git file listing is inconsistent

2014-11-26 Thread Scott Schmit
er git commands, and --files-with-matches for consistency with grep(1). So I don't think anything needs to change. All we need to do is to teach grep(1) the --name-only option, and the cycle will be complete. [I can never remember grep's version of the option...] :-D -- Scott Schmit

Re: git push --all --tags

2014-11-15 Thread Scott Schmit
On Sat, Nov 15, 2014 at 06:58:36PM +0300, Konstantin Khomoutov wrote: > On Sat, 15 Nov 2014 04:44:19 + (UTC) Ryan Jacobs wrote: > > $ git push --all --tags > > error: --all and --tags are incompatible > > > > Why are these flags incompatible? Just wondering 'cause I think that > > it would be

Re: [PATCH v5] lockfile.c: store absolute path

2014-11-04 Thread Scott Schmit
On Sun, Nov 02, 2014 at 07:24:37AM +0100, Michael Haggerty wrote: > Locked paths can be saved in a linked list so that if something wrong > happens, *.lock are removed. For relative paths, this works fine if we > keep cwd the same, which is true 99% of time except: > > - update-index and read-tree

Re: [PATCH 22/32] checkout: support checking out into a new working directory

2014-09-04 Thread Scott Schmit
On Tue, Sep 02, 2014 at 10:51:47AM -0400, Marc Branchaud wrote: > MULTIPLE WORKING TREES > -- > > A git repository can support multiple working trees, allowing you to check > out more than one branch at a time. With `git checkout --to` a new working > tree is associated with t

Re: [PATCH] pretty: Provide a strict ISO8601 date format

2014-08-29 Thread Scott Schmit
On Fri, Aug 29, 2014 at 11:41:39AM -0700, Junio C Hamano wrote: > You feed tz/100 to "%+03d:" (the "sign and hour" part of the > timezone). What if tz is -30, i.e. less than an hour but still a > negative offset? tz/100 would be zero and tz % 100 would be -30. > > tz = -30; > printf("%+0

Re: [PATCH] pretty: Provide a strict ISO8601 date format

2014-08-29 Thread Scott Schmit
r % is followed by zero or more of the following > flags: > > + A sign (+ or -) should always be placed before a number > produced by a signed conversion. By default a sign is > used only for negative numbers. A + overrides a space if >