summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-12 09:42:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-12 09:52:55 -0700
commitb0eab01a4824d9b6bcf23b51881fdc94ab3d38ec (patch)
treede9ebade737fbb27a346a0d092f3c44531219450 /Documentation/git-merge-file.txt
parentgit-branch: add options and tests for branch renaming (diff)
downloadtgif-b0eab01a4824d9b6bcf23b51881fdc94ab3d38ec.tar.xz
branch -m/-M: remove undocumented RENAMED-REF
The commit message for c976d41 (git-branch: add options and tests for branch renaming, 2006-11-28) mentions RENAME_REF but otherwise this is not documented anywhere, and it does not appear in any of the tests. Worse yet, the name of the actual file is "RENAMED-REF". This was supposed to hold the commit object name at the tip of the branch the most recent "branch -m/-M" renamed, but that is not necessary in order to be able to recover from a mistake. Even when "branch -M A B" overwrites an existing branch B, what is kept in RENAMED-REF is the commit at the tip of the original branch A, not the commit B from the now-lost branch. Just remove this unused "feature". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions