summaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2007-02-04 23:52:02 -0500
committerLibravatar Junio C Hamano <junkio@cox.net>2007-02-05 19:09:40 -0800
commitc5650b0840ef1630ab9e67e9e314fb73ca112cdc (patch)
treec50bc592160431241616d96eab09379e0f76bf96 /builtin-log.c
parentFix longstanding mismerge of ALL_CFLAGS vs BASIC_CFLAGS (diff)
downloadtgif-c5650b0840ef1630ab9e67e9e314fb73ca112cdc.tar.xz
bash: Support git-rebase -m continuation completion.
Apparently `git-rebase -m` uses a metadata directory within .git (.git/.dotest-merge) rather than .dotest used by git-am (and git-rebase without the -m option). This caused the completion code to not offer --continue, --skip or --abort when working within a `git-rebase -m` session. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-log.c')
0 files changed, 0 insertions, 0 deletions