| commit | b91a13bbdca0095b1dc9ffb06bcb5caf4aab56b6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 12 Mar 2012 22:43:06 +0000 (12 15:43 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 12 Mar 2012 22:43:15 +0000 (12 15:43 -0700) | ||
| tree | ddece8bdb532d56cf5bbfd8cc6ef102328e8d456 | treesnapshot (tar.gz zip) |
| parent | 0dbe6592ccbd1a394a69a52074e3729d546fe952 | commitdiff |
| parent | a61ba26a4725d4a93297305315587b92324baf0b | commitdiff |
Merge branch 'jc/am-3-nonstandard-popt' into maint
The code to synthesize the fake ancestor tree used by 3-way merge
fallback in "git am" was not prepared to read a patch created with
a non-standard -p<num> value.
* jc/am-3-nonstandard-popt:
test: "am -3" can accept non-standard -p<num>
am -3: allow nonstandard -p<num> option
The code to synthesize the fake ancestor tree used by 3-way merge
fallback in "git am" was not prepared to read a patch created with
a non-standard -p<num> value.
* jc/am-3-nonstandard-popt:
test: "am -3" can accept non-standard -p<num>
am -3: allow nonstandard -p<num> option
| git-am.sh | diff1 | diff2 | blobhistory |
| t/t4150-am.sh | diff1 | diff2 | blobhistory |