diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-22 21:10:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 21:10:21 (GMT) |
| commit | 2bbea5c8f2242ee798e9bee525b485994a8e5911 (patch) | |
| tree | 87e64824719bf59565685d3c3db09ea9ce31a248 /git-merge-one-file.sh | |
| parent | 47847c756b7de9615cf89f353d3d2a84f8a871f1 (diff) | |
| parent | 4d552005323034c1d6311796ac1074e9a4b4b57e (diff) | |
| download | git-2bbea5c8f2242ee798e9bee525b485994a8e5911.zip git-2bbea5c8f2242ee798e9bee525b485994a8e5911.tar.gz git-2bbea5c8f2242ee798e9bee525b485994a8e5911.tar.bz2 | |
Merge branch 'nd/ita-cleanup' into maint
Paths that have been told the index about with "add -N" are not
quite yet in the index, but a few commands behaved as if they
already are in a harmful way.
* nd/ita-cleanup:
grep: make it clear i-t-a entries are ignored
add and use a convenience macro ce_intent_to_add()
blame: remove obsolete comment
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions