summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-11 20:39:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-11 20:39:47 (GMT)
commitc512b035556eff4d8f869afeda5fd78bc7a4966d (patch)
tree46da90bee6578f892bd1a419be8f2835875eef46 /git-merge-resolve.sh
parentd8c416b2518a96e5d535b8e4b2349e7c647a4be5 (diff)
parent936db184f0b51c07aba5e6a8f79352045f887632 (diff)
downloadgit-c512b035556eff4d8f869afeda5fd78bc7a4966d.zip
git-c512b035556eff4d8f869afeda5fd78bc7a4966d.tar.gz
git-c512b035556eff4d8f869afeda5fd78bc7a4966d.tar.bz2
Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maint
* rc/maint-reflog-msg-for-forced-branch: branch: say "Reset to" in reflog entries for 'git branch -f' operations
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions