Thread (1 message) 1 message, 1 author, 2016-06-15
DORMANTno replies

[PATCH 4/5] fetch: Add output for the not fast forward case

From: Santi Béjar <hidden>
Date: 2016-06-15 22:42:42
Subsystem: the rest · Maintainer: Linus Torvalds

Use the ... notation to be able to use this directly in "git log" to see
how the two non-fast-forward heads have diverged.

Signed-off-by: Santi Béjar <redacted>
---
 git-fetch.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/git-fetch.sh b/git-fetch.sh
index 32553f8..ee4f5bd 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -190,6 +190,7 @@ fast_forward_local () {
 		;;
 	    esac || {
 		echo >&2 "* $1: does not fast forward to $3;"
+		echo >&2 "  $(git-rev-parse --short $local)...$(git-rev-parse --short $2)"
 		case ",$force,$single_force," in
 		*,t,*)
 			echo >&2 "  forcing update."
-- 
1.4.2.1.g38049
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help