projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 091df17 4066bd6)
Merge branch 'jk/add-p-skip-conflicts'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 19:43:36 +0000 (12:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 19:43:36 +0000 (12:43 -0700)
commit3c524002d67471f8ef5455ef0e5ce3e6fc846b32
treea836591b51828d4feec3124794509bb43a2cb3f0tree | snapshot
parent091df17f27ed735160bbd82360efb8154b35ffebcommit | diff
parent4066bd6797a36ece00ffcb4814edc11e5ed25f68commit | diff
Merge branch 'jk/add-p-skip-conflicts'

Excludes conflicted paths from "add -p" processing, as it is not prepared
to handle them.

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