* [PATCH 2/2] merge and resolve: Output short hashes and .. in "Updating ..."
@ 2006-10-01 3:34 Santi Béjar
0 siblings, 0 replies; only message in thread
From: Santi Béjar @ 2006-10-01 3:34 UTC (permalink / raw)
To: git
Signed-off-by: Santi Béjar <sbejar@gmail.com>
---
git-merge.sh | 2 +-
git-resolve.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-merge.sh b/git-merge.sh
index 5b34b4d..49c46d5 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -197,7 +197,7 @@ f,*)
;;
?,1,"$head",*)
# Again the most common case of merging one remote.
- echo "Updating from $head to $1"
+ echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
git-update-index --refresh 2>/dev/null
new_head=$(git-rev-parse --verify "$1^0") &&
git-read-tree -u -v -m $head "$new_head" &&
diff --git a/git-resolve.sh b/git-resolve.sh
index 729ec65..36b90e3 100755
--- a/git-resolve.sh
+++ b/git-resolve.sh
@@ -46,7 +46,7 @@ case "$common" in
exit 0
;;
"$head")
- echo "Updating from $head to $merge"
+ echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $merge)"
git-read-tree -u -m $head $merge || exit 1
git-update-ref -m "resolve $merge_name: Fast forward" \
HEAD "$merge" "$head"
--
1.4.2.1.g38049
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2006-10-01 3:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-01 3:34 [PATCH 2/2] merge and resolve: Output short hashes and .. in "Updating ..." Santi Béjar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).