diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-19 13:22:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-19 13:22:24 -0700 |
| commit | 36cafe44443fcca9eb35399ef0e9bfe289ec5dde (patch) | |
| tree | 527ffefe09206951887018da7c3d8b102bc3830b /Documentation/git-mergetool--lib.txt | |
| parent | Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' (diff) | |
| parent | git-p4: place temporary refs used for branch import under refs/git-p4-tmp (diff) | |
| download | tgif-36cafe44443fcca9eb35399ef0e9bfe289ec5dde.tar.xz | |
Merge branch 'ls/p4-tmp-refs'
"git p4" used a location outside $GIT_DIR/refs/ to place its
temporary branches, which has been moved to refs/git-p4-tmp/.
* ls/p4-tmp-refs:
git-p4: place temporary refs used for branch import under refs/git-p4-tmp
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions