diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-09-06 13:11:24 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-06 13:11:24 +0900 |
| commit | 1fb77b3ee5417e7b6af782e43c8b98256861cca5 (patch) | |
| tree | 6ae1e846a596ca2ef177d1ce8f14578cee4ce90d /Documentation/git-mergetool--lib.txt | |
| parent | The fifth batch post 2.14 (diff) | |
| parent | branch: quote branch/ref names to improve readability (diff) | |
| download | tgif-1fb77b3ee5417e7b6af782e43c8b98256861cca5.tar.xz | |
Merge branch 'ks/branch-set-upstream'
"branch --set-upstream" that has been deprecated in Git 1.8 has
finally been retired.
* ks/branch-set-upstream:
branch: quote branch/ref names to improve readability
builtin/branch: stop supporting the "--set-upstream" option
t3200: cleanup cruft of a test
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions