diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-14 18:56:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-14 18:56:05 -0700 |
| commit | 40d8cfe4117564e5520e8f4f953addaa94844476 (patch) | |
| tree | 9dd2fb169a2d4a2c0f49bf9537cf9aa314614342 | |
| parent | 479346adc5ebb099121063d4c06da30093ed9b3b (diff) | |
| download | git-40d8cfe4117564e5520e8f4f953addaa94844476.tar.gz | |
Trivial git script fixups
Fix permissions, and add trivial "reset" and "add" scripts.
The "reset" script just resets the index back to head, while the "add"
script is just a crutch for people used to do "cvs add".
| -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 0000000000..7726886da4 --- /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 d70e8b9f29..ae1587121b 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 137280ac72..137280ac72 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 0000000000..eaefd00d9d --- /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 0b04a5f6af..0b04a5f6af 100644..100755 --- a/git-resolve-script +++ b/git-resolve-script |