Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jv/maint-no-ext-diff' into maint | Junio C Hamano | 2012-07-30 | 2 | -3/+64 |
|\ | |||||
| * | diff: test precedence of external diff drivers | Jeff King | 2012-07-19 | 1 | -0/+40 |
| * | diff: correctly disable external_diff with --no-ext-diff | Junio C Hamano | 2012-07-17 | 2 | -3/+24 |
* | | Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maint | Junio C Hamano | 2012-07-30 | 2 | -0/+8 |
|\ \ | |||||
| * | | am: indicate where a failed patch is to be found | Paul Gortmaker | 2012-07-13 | 2 | -0/+8 |
| |/ | |||||
* | | Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maint | Junio C Hamano | 2012-07-30 | 2 | -2/+17 |
|\ \ | |||||
| * | | submodules: don't stumble over symbolic links when cloning recursively | Jens Lehmann | 2012-07-12 | 2 | -2/+17 |
* | | | Merge branch 'jc/maint-filter-branch-epoch-date' into maint | Junio C Hamano | 2012-07-30 | 4 | -5/+15 |
|\ \ \ | |||||
| * | | | t7003: add test to filter a branch with a commit at epoch | Junio C Hamano | 2012-07-12 | 2 | -3/+13 |
| * | | | date.c: Fix off by one error in object-header date parsing | Junio C Hamano | 2012-07-12 | 1 | -1/+1 |
| * | | | filter-branch: do not forget the '@' prefix to force git-timestamp | Junio C Hamano | 2012-07-09 | 1 | -1/+1 |
* | | | | Git 1.7.11.3v1.7.11.3 | Junio C Hamano | 2012-07-22 | 4 | -3/+57 |
* | | | | Merge branch 'jk/push-delete-ref-error-message' into maint | Junio C Hamano | 2012-07-22 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | push: don't guess at qualifying remote refs on deletion | Jeff King | 2012-07-03 | 1 | -0/+3 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'ar/clone-honor-umask-at-top' into maint | Junio C Hamano | 2012-07-22 | 3 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | add: create ADD_EDIT.patch with mode 0666 | Jeff King | 2012-07-09 | 1 | -1/+1 |
| * | | | | rerere: make rr-cache fanout directory honor umask | Junio C Hamano | 2012-07-09 | 1 | -1/+1 |
| * | | | | Restore umasks influence on the permissions of work tree created by clone | Alex Riesen | 2012-07-09 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'cw/amend-commit-without-message' into maint | Junio C Hamano | 2012-07-22 | 2 | -1/+16 |
|\ \ \ \ | |||||
| * | | | | Allow edit of empty message with commit --amend | Chris Webb | 2012-07-09 | 2 | -1/+16 |
| |/ / / | |||||
* | | | | Merge branch 'jk/maint-commit-amend-only-no-paths' into maint | Junio C Hamano | 2012-07-22 | 2 | -1/+14 |
|\ \ \ \ | |||||
| * | | | | commit: fix "--amend --only" with no pathspec | Jeff King | 2012-07-10 | 2 | -1/+14 |
* | | | | | Merge branch 'tg/maint-cache-name-compare' into maint | Junio C Hamano | 2012-07-22 | 2 | -4/+48 |
|\ \ \ \ \ | |||||
| * | | | | | cache_name_compare(): do not truncate while comparing paths | Junio C Hamano | 2012-07-11 | 2 | -4/+48 |
* | | | | | | Merge branch 'tr/maint-show-walk' into maint | Junio C Hamano | 2012-07-22 | 2 | -0/+94 |
|\ \ \ \ \ \ | |||||
| * | | | | | | show: fix "range implies walking" | Junio C Hamano | 2012-06-19 | 2 | -2/+5 |
| * | | | | | | Demonstrate git-show is broken with ranges | Thomas Rast | 2012-06-19 | 1 | -0/+91 |
* | | | | | | | Merge branch 'jc/refactor-diff-stdin' into maint | Junio C Hamano | 2012-07-22 | 4 | -50/+67 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | diff-index.c: "git diff" has no need to read blob from the standard input | Junio C Hamano | 2012-06-28 | 4 | -31/+55 |
| * | | | | | | | diff-index.c: unify handling of command line paths | Junio C Hamano | 2012-06-28 | 1 | -16/+11 |
| * | | | | | | | diff-index.c: do not pretend paths are pathspecs | Junio C Hamano | 2012-06-28 | 1 | -7/+5 |
* | | | | | | | | Merge branch 'mz/empty-rebase-test' into maint | Junio C Hamano | 2012-07-22 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add test case for rebase of empty commit | Martin von Zweigbergk | 2012-06-27 | 1 | -0/+8 |
* | | | | | | | | | Merge branch 'js/fast-export-paths-with-spaces' into maint | Junio C Hamano | 2012-07-22 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fast-export: quote paths with spaces | Jay Soffian | 2012-06-27 | 2 | -1/+3 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'cw/no-detaching-an-unborn' into maint | Junio C Hamano | 2012-07-22 | 2 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-checkout: disallow --detach on unborn branch | Chris Webb | 2012-06-26 | 2 | -0/+8 |
* | | | | | | | | | | Merge branch 'vr/use-our-perl-in-tests' into maint | Junio C Hamano | 2012-07-22 | 26 | -44/+65 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t/README: add a bit more Don'ts | Junio C Hamano | 2012-06-24 | 1 | -3/+22 |
| * | | | | | | | | | | tests: enclose $PERL_PATH in double quotes | Junio C Hamano | 2012-06-24 | 24 | -41/+41 |
| * | | | | | | | | | | t/test-lib.sh: export PERL_PATH for use in scripts | Junio C Hamano | 2012-06-24 | 1 | -0/+2 |
| * | | | | | | | | | | t: Replace 'perl' by $PERL_PATH | Vincent van Ravesteijn | 2012-06-12 | 24 | -41/+41 |
* | | | | | | | | | | | Git 1.7.11.2v1.7.11.2 | Junio C Hamano | 2012-07-11 | 4 | -3/+57 |
* | | | | | | | | | | | Merge branch 'jc/maint-blame-unique-abbrev' into maint | Junio C Hamano | 2012-07-11 | 1 | -4/+21 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | blame: compute abbreviation width that ensures uniqueness | Junio C Hamano | 2012-07-02 | 1 | -4/+21 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'rj/platform-pread-may-be-thread-unsafe' into maint | Junio C Hamano | 2012-07-11 | 2 | -2/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | index-pack: Disable threading on cygwin | Junio C Hamano | 2012-06-26 | 2 | -2/+10 |
* | | | | | | | | | | | | Merge branch 'th/diff-no-index-fixes' into maint | Junio C Hamano | 2012-07-11 | 5 | -24/+112 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds ch... | Tim Henigan | 2012-06-22 | 2 | -2/+73 |
| * | | | | | | | | | | | | diff: handle relative paths in no-index | Jeff King | 2012-06-22 | 4 | -22/+39 |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |