summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Uwe Kleine-König <u.kleine-koenig@pengutronix.de>2009-06-11 22:27:55 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-06-11 14:01:15 -0700
commit795cbe938fdc60228c4c9654a658aa27a7570b79 (patch)
tree99f646de769d0fc9a13dae741db6f954fa8ec2e3 /Documentation/git-merge-file.txt
parentrebase -i: provide reasonable reflog for the rebased branch (diff)
downloadtgif-795cbe938fdc60228c4c9654a658aa27a7570b79.tar.xz
rebase--interactive: remote stray closing parenthesis
it was introduced in 68a163c9b483ae352fcfee8c4505d113213daa73 Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: Jöhännës "Dschö" Schindëlin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions