Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/add-e-submodule-fix' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 13 Feb 2012 19:42:18 +0000
(11:42 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 13 Feb 2012 19:42:18 +0000
(11:42 -0800)
* js/add-e-submodule-fix:
add -e: do not show difference in a submodule that is merely dirty
1
2
builtin/add.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
87cb3b8
701825d
)
diff --cc
builtin/add.c
Simple merge