diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-09 20:42:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-09 20:42:10 -0700 |
| commit | da288e25d9e10b746cf3b311cb4503d1810cde37 (patch) | |
| tree | 3fdf480d143a4d5d47b73b6cbeb16614d2be2332 /t/t7601-merge-pull-config.sh | |
| parent | Merge early parts of jk/cached-textconv (diff) | |
| parent | branch: say "Reset to" in reflog entries for 'git branch -f' operations (diff) | |
| download | tgif-da288e25d9e10b746cf3b311cb4503d1810cde37.tar.xz | |
Merge branch 'rc/maint-reflog-msg-for-forced-branch'
* rc/maint-reflog-msg-for-forced-branch:
branch: say "Reset to" in reflog entries for 'git branch -f' operations
Conflicts:
builtin-branch.c
Diffstat (limited to 't/t7601-merge-pull-config.sh')
0 files changed, 0 insertions, 0 deletions