summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Conrad Irwin <conrad.irwin@gmail.com>2011-08-20 14:49:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-22 16:03:43 -0700
commit587a9ee7da348f5e6696720d770d0e0da597827c (patch)
treea5d378daeaec78a7d513056071b78c419b0ed515 /Documentation/git-merge-one-file.txt
parentPrevent force-updating of the current branch (diff)
downloadtgif-587a9ee7da348f5e6696720d770d0e0da597827c.tar.xz
Show interpreted branch name in error messages
Change the error message when doing: "git branch @{-1}", "git checkout -b @{-1}", or "git branch -m foo @{-1}" * was: A branch named '@{-1}' already exists. * now: A branch named 'bar' already exists. Signed-off-by: Conrad Irwin <conrad.irwin@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions