mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-23 18:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

allow double click on current HEAD id after git-pull

Browse Source 
Double click on to current HEAD commit id is not possible,
the dot has to go.

[jc: by popular requests.]

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Olaf Hering 2006-02-11 12:26:30 +01:00 committed by Junio C Hamano
parent f61c2c970c
commit 180b0d7483
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge.sh
View File

@ -131,7 +131,7 @@ case "$#,$common,$no_commit" in
;;
1,"$head",*)
# Again the most common case of merging one remote.
echo "Updating from $head to $1."
echo "Updating from $head to $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" &&

2
git-resolve.sh
View File

@ -41,7 +41,7 @@ case "$common" in
exit 0
;;
"$head")
echo "Updating from $head to $merge."
echo "Updating from $head to $merge"
git-read-tree -u -m $head $merge || exit 1
git-update-ref HEAD "$merge" "$head"
git-diff-tree -p $head $merge | git-apply --stat