{"thread":{"id":"5773","subject":"[PATCH 2/2] merge and resolve: Output short hashes and .. in \"Updating ...\"","startedAt":"2006-10-01T03:34:17Z","lastAt":"2006-10-01T03:34:17Z","messageCount":1,"participants":["Santi Béjar"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"28052","messageId":"87u02o675y.fsf@gmail.com","threadId":"5773","inReplyTo":null,"subject":"[PATCH 2/2] merge and resolve: Output short hashes and .. in \"Updating ...\"","fromName":"Santi Béjar","fromEmail":"sbejar@gmail.com","sentAt":"2006-10-01T03:34:17Z","receivedAt":"2006-10-01T03:34:17Z","isPatch":true,"sender":{"key":"santi@agolina.net","avatar":null},"body":"\n\nSigned-off-by: Santi Béjar <sbejar@gmail.com>\n---\n git-merge.sh   |    2 +-\n git-resolve.sh |    2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-merge.sh b/git-merge.sh\nindex 5b34b4d..49c46d5 100755\n--- a/git-merge.sh\n+++ b/git-merge.sh\n@@ -197,7 +197,7 @@ f,*)\n \t;;\n ?,1,\"$head\",*)\n \t# Again the most common case of merging one remote.\n-\techo \"Updating from $head to $1\"\n+\techo \"Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)\"\n \tgit-update-index --refresh 2>/dev/null\n \tnew_head=$(git-rev-parse --verify \"$1^0\") &&\n \tgit-read-tree -u -v -m $head \"$new_head\" &&\ndiff --git a/git-resolve.sh b/git-resolve.sh\nindex 729ec65..36b90e3 100755\n--- a/git-resolve.sh\n+++ b/git-resolve.sh\n@@ -46,7 +46,7 @@ case \"$common\" in\n \texit 0\n \t;;\n \"$head\")\n-\techo \"Updating from $head to $merge\"\n+\techo \"Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $merge)\"\n \tgit-read-tree -u -m $head $merge || exit 1\n \tgit-update-ref -m \"resolve $merge_name: Fast forward\" \\\n \t\tHEAD \"$merge\" \"$head\"\n-- \n1.4.2.1.g38049\n"}]}