diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-21 11:42:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-21 11:42:45 -0800 |
| commit | b43ba7891422127eb3ec7bd88c9a8ea102b19d0c (patch) | |
| tree | 754ddb2158252c6dccf0310d9dde344acf10b3d9 /Documentation/git-merge-one-file.txt | |
| parent | Merge branch 'tr/userdiff-c-returns-pointer' into maint (diff) | |
| parent | diff/status: print submodule path when looking for changes fails (diff) | |
| download | tgif-b43ba7891422127eb3ec7bd88c9a8ea102b19d0c.tar.xz | |
Merge branch 'jl/submodule-status-failure-report' into maint
* jl/submodule-status-failure-report:
diff/status: print submodule path when looking for changes fails
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions