summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorLibravatar Björn Gustavsson <bgustavsson@gmail.com>2010-02-06 09:37:53 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-06 09:51:43 -0800
commit6d0d465e20b8c11924bc4e75563324771d0e0d63 (patch)
treedcc126f66ee3c91f157b355f7d828df33eece550 /builtin-merge.c
parentMerge git://git.kernel.org/pub/scm/gitk/gitk (diff)
downloadtgif-6d0d465e20b8c11924bc4e75563324771d0e0d63.tar.xz
bash: support the --autosquash option for rebase
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions