summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar SZEDER Gábor <szeder@ira.uka.de>2009-12-05 01:51:41 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-12-05 17:48:39 -0800
commit9a424b276c409a3510e7735b6ecc012f50dc2a49 (patch)
treee3417b0a64b470634ce7e778ac62994d4bd73705 /Documentation/merge-strategies.txt
parentSync with 1.6.5.5 (diff)
downloadtgif-9a424b276c409a3510e7735b6ecc012f50dc2a49.tar.xz
bash: update 'git commit' completion
I just wanted to add the recently learnt '--reset-author' option, but then noticed that there are many more options missing. This patch adds support for all of 'git commit's options, except '--allow-empty', because it is primarily there for foreign scm interfaces. Furthermore, this patch also adds support for completing the arguments of those options that take a non-filename argument: valid modes are offered for '--cleanup' and '--untracked-files', while refs for '--reuse-message' and '--reedit-message', because these two take a commit as argument. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions