summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorSanti B,Ai(Bjar <sbejar@gmail.com>2006-10-01 03:33:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-01 05:02:36 (GMT)
commit20a3847d8a5032ce41f90dcc68abfb36e6fee9b1 (patch)
tree8ea294eb6f1e2b12cbcb5c23549d2fa351f973b9 /git-merge.sh
parentdd0c367e5e1358539bdd11c3a474bb6792504d30 (diff)
downloadgit-20a3847d8a5032ce41f90dcc68abfb36e6fee9b1.zip
git-20a3847d8a5032ce41f90dcc68abfb36e6fee9b1.tar.gz
git-20a3847d8a5032ce41f90dcc68abfb36e6fee9b1.tar.bz2
fetch: Misc output cleanup
In particular it removes duplicate information, uses short hashes (as git-log and company) and uses .. for fast forwarding commits and ... for not-fast-forwarding commits (shorter, easier to copy&paste). It also reformat the output as: 1. the ones we store in our local ref (either branches or tags): 1a) fast-forward * refs/heads/origin: fast forward to branch 'master' of ../git/ old..new: 1ad7a06..bc1a580 1b) same (only shown under -v) * refs/heads/next: same as branch 'origin/next' of ../git/ commit: ce47b9f 1c) non-fast-forward, forced * refs/heads/pu: forcing update to non-fast forward branch 'pu' of ../git/ old...new: 7c733a8...5faa935 1d) non-fast-forward, did not update because not forced * refs/heads/po: not updating to non-fast forward branch 'po' of ../git/ old...new: 7c733a8...5faa935 1e) creating a new local ref to store * refs/tags/v1.4.2-rc4: storing tag 'v1.4.2-rc4' of ../git/ tag: 8c7a107 * refs/heads/next: storing branch 'next' of ../git/ commit: f8a20ae 2. the ones we do not store in our local ref (only shown under -v): * fetched branch 'master' of ../git commit: 695dffe * fetched tag 'v1.4.2-rc4' of ../git tag: 8c7a107 Signed-off-by: Santi B.ANijar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions