diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:19:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:19:31 -0700 |
| commit | 1da6d98a9acd2db3902bf432a097771c76f4fd44 (patch) | |
| tree | cccdbb4533c6998fbba362569906f24c9f4a87cc /merge-recursive.h | |
| parent | Merge branch 'jk/pager-with-external-command' (diff) | |
| parent | Show interpreted branch name in error messages (diff) | |
| download | tgif-1da6d98a9acd2db3902bf432a097771c76f4fd44.tar.xz | |
Merge branch 'ci/forbid-unwanted-current-branch-update'
* ci/forbid-unwanted-current-branch-update:
Show interpreted branch name in error messages
Prevent force-updating of the current branch
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions