summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorBrandon Casey <casey@nrlssc.navy.mil>2008-02-22 19:04:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-23 06:57:38 (GMT)
commit55f105653715356fe0b2392445a6f394b891402c (patch)
tree78a6820fbaf3eb82d3d04f58862abdfa08366e4e /Documentation/git-merge-file.txt
parent435fc8523fd3a625acfeebffe433f1f7516ab9e2 (diff)
downloadgit-55f105653715356fe0b2392445a6f394b891402c.zip
git-55f105653715356fe0b2392445a6f394b891402c.tar.gz
git-55f105653715356fe0b2392445a6f394b891402c.tar.bz2
git-reflog: add option --updateref to write the last reflog sha1 into the ref
Certain sanity checks on the reflog assume that the sha1 of the top reflog entry will be equal to the sha1 stored in the ref. When reflog entries are deleted, this assumption may not hold. This patch adds a new option to git-reflog which causes the subcommands "expire" and "delete" to update the ref with the sha1 of the top-most reflog entry. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions