diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | git-add-script | 2 | ||||
| -rwxr-xr-x | git-diff-script | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | git-external-diff-script | 0 | ||||
| -rwxr-xr-x | git-reset-script | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | git-resolve-script | 0 |
6 files changed, 10 insertions, 4 deletions
@@ -23,7 +23,8 @@ INSTALL=install SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \ git-pull-script git-tag-script git-resolve-script git-whatchanged \ git-deltafy-script git-fetch-script git-status-script git-commit-script \ - git-log-script git-shortlog git-cvsimport-script git-diff-script + git-log-script git-shortlog git-cvsimport-script git-diff-script \ + git-reset-script git-add-script PROG= git-update-cache git-diff-files git-init-db git-write-tree \ git-read-tree git-commit-tree git-cat-file git-fsck-cache \ diff --git a/git-add-script b/git-add-script new file mode 100755 index 0000000..7726886 --- /dev/null +++ b/git-add-script @@ -0,0 +1,2 @@ +#!/bin/sh +git-update-cache --add "$@" diff --git a/git-diff-script b/git-diff-script index d70e8b9..ae15871 100755 --- a/git-diff-script +++ b/git-diff-script @@ -3,13 +3,13 @@ rev=($(git-rev-parse --revs-only "$@")) flags=($(git-rev-parse --no-revs "$@")) case "${#rev[*]}" in 0) - git-diff-files -p "$@";; + git-diff-files -p -C "$@";; 1) - git-diff-cache -p "$@";; + git-diff-cache -p -C "$@";; 2) begin=$(echo "${rev[1]}" | tr -d '^') end="${rev[0]}" - git-diff-tree -p $flags $begin $end;; + git-diff-tree -p -C $flags $begin $end;; *) echo "I don't understand" exit 1;; diff --git a/git-external-diff-script b/git-external-diff-script index 137280a..137280a 100644..100755 --- a/git-external-diff-script +++ b/git-external-diff-script diff --git a/git-reset-script b/git-reset-script new file mode 100755 index 0000000..eaefd00 --- /dev/null +++ b/git-reset-script @@ -0,0 +1,3 @@ +#!/bin/sh +git-read-tree --reset HEAD +git-update-cache --refresh diff --git a/git-resolve-script b/git-resolve-script index 0b04a5f..0b04a5f 100644..100755 --- a/git-resolve-script +++ b/git-resolve-script |