projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 695db86 4066bd6)
Merge branch 'jk/add-p-skip-conflicts' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:35:07 +0000 (10:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:35:07 +0000 (10:35 -0700)
commit4579a0547cc558bd0e341adb77897e1f2f331f78
tree4ce984365e8935077422adcff522a2ac31c7ea03tree | snapshot
parent695db86ad73cc3c1dca43fb60cdf469f8d26e358commit | diff
parent4066bd6797a36ece00ffcb4814edc11e5ed25f68commit | diff
Merge branch 'jk/add-p-skip-conflicts' into maint

"git add -p" is not designed to deal with unmerged paths but did
not exclude them and tried to apply funny patches only to fail.

By Jeff King
* jk/add-p-skip-conflicts:
  add--interactive: ignore unmerged entries in patch mode
Git—the stupid content tracker