projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
91527e5
a61ba26
)
Merge branch 'jc/am-3-nonstandard-popt'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 5 Mar 2012 07:35:12 +0000
(23:35 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 5 Mar 2012 07:35:12 +0000
(23:35 -0800)
* jc/am-3-nonstandard-popt:
test: "am -3" can accept non-standard -p<num>
am -3: allow nonstandard -p<num> option
1
2
git-am.sh
patch
|
diff1
|
diff2
|
blob
|
history
t/t4150-am.sh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
git-am.sh
Simple merge
diff --cc
t/t4150-am.sh
Simple merge
projects / git.git / commitdiff