diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-15 14:22:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-15 14:22:13 -0700 |
| commit | 663ee1a4c9b9caa4c8f446934410ca636f998df6 (patch) | |
| tree | 16709d531edb349a53910e3f7dd7c4a306b73cbb /Documentation/git-mergetool--lib.txt | |
| parent | Merge branch 'fk/maint-cvsimport-early-failure' (diff) | |
| parent | branch/checkout --track: Ensure that upstream branch is indeed a branch (diff) | |
| download | tgif-663ee1a4c9b9caa4c8f446934410ca636f998df6.tar.xz | |
Merge branch 'jh/maint-do-not-track-non-branches'
* jh/maint-do-not-track-non-branches:
branch/checkout --track: Ensure that upstream branch is indeed a branch
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions