diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-16 12:43:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-16 12:43:36 -0700 |
| commit | 3c524002d67471f8ef5455ef0e5ce3e6fc846b32 (patch) | |
| tree | a836591b51828d4feec3124794509bb43a2cb3f0 /t/t1001-read-tree-m-2way.sh | |
| parent | Merge branch 'jc/commit-unedited-template' (diff) | |
| parent | add--interactive: ignore unmerged entries in patch mode (diff) | |
| download | tgif-3c524002d67471f8ef5455ef0e5ce3e6fc846b32.tar.xz | |
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
Diffstat (limited to 't/t1001-read-tree-m-2way.sh')
0 files changed, 0 insertions, 0 deletions