author | Junio C Hamano <gitster@pobox.com> | |
Thu, 2 Jul 2009 02:40:50 +0000 (19:40 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 2 Jul 2009 02:40:50 +0000 (19:40 -0700) |
* sb/quiet-porcelains:
stash: teach quiet option
am, rebase: teach quiet option
submodule, repack: migrate to git-sh-setup's say()
git-sh-setup: introduce say() for quiet options
am: suppress apply errors when using 3-way
t4150: test applying with a newline in subject
stash: teach quiet option
am, rebase: teach quiet option
submodule, repack: migrate to git-sh-setup's say()
git-sh-setup: introduce say() for quiet options
am: suppress apply errors when using 3-way
t4150: test applying with a newline in subject
1 | 2 | |||
---|---|---|---|---|
git-rebase.sh | patch | | diff1 | | diff2 | | blob | history |
git-submodule.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc git-rebase.sh
Simple merge
diff --cc git-submodule.sh
Simple merge