diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-13 11:22:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-13 11:22:38 -0800 |
| commit | be941a2c34d2d37285ee5932190d900b4a034c63 (patch) | |
| tree | aab983ca9bc9cba0af2c5d1f7063497ee32df2ab /Documentation/git-merge.txt | |
| parent | Merge branch 'jk/cat-file-regression-fix' into maint (diff) | |
| parent | rev-parse: be more careful with munging arguments (diff) | |
| download | tgif-be941a2c34d2d37285ee5932190d900b4a034c63.tar.xz | |
Merge branch 'jk/rev-parse-double-dashes' into maint
"git rev-parse <revs> -- <paths>" did not implement the usual
disambiguation rules the commands in the "git log" family used in
the same way.
* jk/rev-parse-double-dashes:
rev-parse: be more careful with munging arguments
rev-parse: correctly diagnose revision errors before "--"
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions