]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c33e306 dff4b0e)
Merge branch 'gb/maint-am-patch-format-error-message'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:18:07 +0000 (13:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:18:07 +0000 (13:18 -0700)
commite7734c6c9b04d78e970b8de4765cdebd984ec6e6
tree5b82e7fdb271f0f414e56916bb5dd7d653ed2e93tree | snapshot
parentc33e30675b601d6707dc4022a8f64812509c7566commit | diff
parentdff4b0ef30cd3f06e1f2383ce09f81b8da94d5b3commit | diff
Merge branch 'gb/maint-am-patch-format-error-message'

* gb/maint-am-patch-format-error-message:
  am: format is in $patch_format, not parse_patch

Conflicts:
git-am.sh
Documentation/RelNotes/1.7.7.txt diff1 | | blob | history
git-am.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.