diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:12:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:12:25 -0700 |
| commit | 87d99c64dfa8880592104245896557aa530d4fd9 (patch) | |
| tree | baf019f2b0272eb4a6033d9f1c78f0f80be9d665 /Documentation/git-help.txt | |
| parent | Merge branch 'mz/remote-rename' into maint-1.7.6 (diff) | |
| parent | mergetool: no longer need to save standard input (diff) | |
| download | tgif-87d99c64dfa8880592104245896557aa530d4fd9.tar.xz | |
Merge branch 'jm/mergetool-pathspec' into maint-1.7.6
* jm/mergetool-pathspec:
mergetool: no longer need to save standard input
mergetool: Use args as pathspec to unmerged files
Diffstat (limited to 'Documentation/git-help.txt')
0 files changed, 0 insertions, 0 deletions