diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:27:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:27:36 -0800 |
| commit | 15a171f6eb436f9a31986f78bbb115ed4540ad5b (patch) | |
| tree | ec842014cc66b120d3923bcc01e7815dff84e7f0 /git-mergetool.sh | |
| parent | Merge branch 'tb/t0027-eol-conversion' (diff) | |
| parent | branch: allow -f with -m and -d (diff) | |
| download | tgif-15a171f6eb436f9a31986f78bbb115ed4540ad5b.tar.xz | |
Merge branch 'mg/branch-d-m-f'
"git branch -d" (delete) and "git branch -m" (move) learned to
honor "-f" (force) flag; unlike many other subcommands, the way to
force these have been with separate "-D/-M" options, which was
inconsistent.
* mg/branch-d-m-f:
branch: allow -f with -m and -d
t3200-branch: test -M
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions