diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-23 00:07:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-23 00:07:17 -0700 |
| commit | 89305da8a230e435109cc97ed88241c158813523 (patch) | |
| tree | 099925d87bdb82a735df5f857a724e3e067ac40b /git-diff-script | |
| parent | Merge refs/heads/master from . (diff) | |
| parent | Clean-up output from "git show-branch" and document it. (diff) | |
| download | git-89305da8a230e435109cc97ed88241c158813523.tar.gz git-89305da8a230e435109cc97ed88241c158813523.zip | |
Merge refs/heads/master from .
Diffstat (limited to 'git-diff-script')
| -rwxr-xr-x | git-diff-script | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/git-diff-script b/git-diff-script index 926f594be4..99ff2640f1 100755 --- a/git-diff-script +++ b/git-diff-script @@ -8,8 +8,14 @@ case "${#rev[*]}" in 1) git-diff-cache -M -p "$@";; 2) - begin=$(echo "${rev[1]}" | tr -d '^') - end="${rev[0]}" + case "${rev[1]}" in + ^?*) + begin=$(echo "${rev[1]}" | tr -d '^') + end="${rev[0]}" ;; + *) + begin="${rev[0]}" + end="${rev[1]}" ;; + esac git-diff-tree -M -p $flags $begin $end $files;; *) echo "I don't understand" |