diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-12 15:43:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-12 15:43:15 -0700 |
| commit | b91a13bbdca0095b1dc9ffb06bcb5caf4aab56b6 (patch) | |
| tree | ddece8bdb532d56cf5bbfd8cc6ef102328e8d456 /gitweb | |
| parent | 0dbe6592ccbd1a394a69a52074e3729d546fe952 (diff) | |
| parent | a61ba26a4725d4a93297305315587b92324baf0b (diff) | |
| download | git-b91a13bbdca0095b1dc9ffb06bcb5caf4aab56b6.tar.gz git-b91a13bbdca0095b1dc9ffb06bcb5caf4aab56b6.tar.xz | |
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
Diffstat (limited to 'gitweb')
0 files changed, 0 insertions, 0 deletions