From: "Santi Béjar" <sbejar@gmail.com>
To: git <git@vger.kernel.org>
Subject: [PATCH 2/5] fetch & co: Use "hash1..hash2" instead of "from hash1 to hash2"
Date: Fri, 29 Sep 2006 20:06:15 +0200 [thread overview]
Message-ID: <87irj61rag.fsf@gmail.com> (raw)
In-Reply-To: <87r6xu1rci.fsf@gmail.com> (Santi Béjar's message of "Fri, 29 Sep 2006 20:05:01 +0200")
I find it shorter, easier to copy&paste and cleaner.
Signed-off-by: Santi Béjar <sbejar@gmail.com>
---
git-fetch.sh | 2 +-
git-merge.sh | 2 +-
git-resolve.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-fetch.sh b/git-fetch.sh
index f1522bd..08d86cd 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -182,7 +182,7 @@ fast_forward_local () {
;;
*,$local)
echo >&2 "* $1: fast forward to $3"
- echo >&2 " from $local to $2"
+ echo >&2 " $local..$2"
git-update-ref -m "$rloga: fast-forward" "$1" "$2" "$local"
;;
*)
diff --git a/git-merge.sh b/git-merge.sh
index 5b34b4d..fd587c5 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 $head..$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..6e4fb02 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 $head..$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
next prev parent reply other threads:[~2006-09-29 18:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-29 18:05 [PATCH 0/5] fetch & co: misc output cleanup Santi Béjar
2006-09-29 18:05 ` [PATCH 1/5] fetch: Reset remote refs list each time fetch_main is called Santi Béjar
2006-09-29 18:06 ` Santi Béjar [this message]
2006-09-29 18:06 ` [PATCH 3/5] fetch & co: Use short sha1 in the output Santi Béjar
2006-09-29 18:07 ` [PATCH 4/5] fetch: Add output for the not fast forward case Santi Béjar
2006-09-29 18:08 ` [PATCH 5/5] fetch: Clean output Santi Béjar
2006-09-30 2:17 ` Junio C Hamano
2006-09-30 9:42 ` Santi
2006-09-30 10:37 ` Junio C Hamano
2006-09-29 18:54 ` [PATCH 0/5] fetch & co: misc output cleanup A Large Angry SCM
2006-09-29 20:48 ` Santi
2006-09-29 21:27 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87irj61rag.fsf@gmail.com \
--to=sbejar@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.