summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jv/maint-no-ext-diff' into maintJunio C Hamano2012-07-302-3/+64
|\
| * diff: test precedence of external diff driversJeff King2012-07-191-0/+40
| * diff: correctly disable external_diff with --no-ext-diffJunio C Hamano2012-07-172-3/+24
* | Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maintJunio C Hamano2012-07-302-0/+8
|\ \
| * | am: indicate where a failed patch is to be foundPaul Gortmaker2012-07-132-0/+8
| |/
* | Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maintJunio C Hamano2012-07-302-2/+17
|\ \
| * | submodules: don't stumble over symbolic links when cloning recursivelyJens Lehmann2012-07-122-2/+17
* | | Merge branch 'jc/maint-filter-branch-epoch-date' into maintJunio C Hamano2012-07-304-5/+15
|\ \ \
| * | | t7003: add test to filter a branch with a commit at epochJunio C Hamano2012-07-122-3/+13
| * | | date.c: Fix off by one error in object-header date parsingJunio C Hamano2012-07-121-1/+1
| * | | filter-branch: do not forget the '@' prefix to force git-timestampJunio C Hamano2012-07-091-1/+1
* | | | Git 1.7.11.3v1.7.11.3Junio C Hamano2012-07-224-3/+57
* | | | Merge branch 'jk/push-delete-ref-error-message' into maintJunio C Hamano2012-07-221-0/+3
|\ \ \ \
| * | | | push: don't guess at qualifying remote refs on deletionJeff King2012-07-031-0/+3
| | |/ / | |/| |
* | | | Merge branch 'ar/clone-honor-umask-at-top' into maintJunio C Hamano2012-07-223-3/+3
|\ \ \ \
| * | | | add: create ADD_EDIT.patch with mode 0666Jeff King2012-07-091-1/+1
| * | | | rerere: make rr-cache fanout directory honor umaskJunio C Hamano2012-07-091-1/+1
| * | | | Restore umasks influence on the permissions of work tree created by cloneAlex Riesen2012-07-091-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'cw/amend-commit-without-message' into maintJunio C Hamano2012-07-222-1/+16
|\ \ \ \
| * | | | Allow edit of empty message with commit --amendChris Webb2012-07-092-1/+16
| |/ / /
* | | | Merge branch 'jk/maint-commit-amend-only-no-paths' into maintJunio C Hamano2012-07-222-1/+14
|\ \ \ \
| * | | | commit: fix "--amend --only" with no pathspecJeff King2012-07-102-1/+14
* | | | | Merge branch 'tg/maint-cache-name-compare' into maintJunio C Hamano2012-07-222-4/+48
|\ \ \ \ \
| * | | | | cache_name_compare(): do not truncate while comparing pathsJunio C Hamano2012-07-112-4/+48
* | | | | | Merge branch 'tr/maint-show-walk' into maintJunio C Hamano2012-07-222-0/+94
|\ \ \ \ \ \
| * | | | | | show: fix "range implies walking"Junio C Hamano2012-06-192-2/+5
| * | | | | | Demonstrate git-show is broken with rangesThomas Rast2012-06-191-0/+91
* | | | | | | Merge branch 'jc/refactor-diff-stdin' into maintJunio C Hamano2012-07-224-50/+67
|\ \ \ \ \ \ \
| * | | | | | | diff-index.c: "git diff" has no need to read blob from the standard inputJunio C Hamano2012-06-284-31/+55
| * | | | | | | diff-index.c: unify handling of command line pathsJunio C Hamano2012-06-281-16/+11
| * | | | | | | diff-index.c: do not pretend paths are pathspecsJunio C Hamano2012-06-281-7/+5
* | | | | | | | Merge branch 'mz/empty-rebase-test' into maintJunio C Hamano2012-07-221-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | add test case for rebase of empty commitMartin von Zweigbergk2012-06-271-0/+8
* | | | | | | | | Merge branch 'js/fast-export-paths-with-spaces' into maintJunio C Hamano2012-07-222-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fast-export: quote paths with spacesJay Soffian2012-06-272-1/+3
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'cw/no-detaching-an-unborn' into maintJunio C Hamano2012-07-222-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-checkout: disallow --detach on unborn branchChris Webb2012-06-262-0/+8
* | | | | | | | | | Merge branch 'vr/use-our-perl-in-tests' into maintJunio C Hamano2012-07-2226-44/+65
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t/README: add a bit more Don'tsJunio C Hamano2012-06-241-3/+22
| * | | | | | | | | | tests: enclose $PERL_PATH in double quotesJunio C Hamano2012-06-2424-41/+41
| * | | | | | | | | | t/test-lib.sh: export PERL_PATH for use in scriptsJunio C Hamano2012-06-241-0/+2
| * | | | | | | | | | t: Replace 'perl' by $PERL_PATHVincent van Ravesteijn2012-06-1224-41/+41
* | | | | | | | | | | Git 1.7.11.2v1.7.11.2Junio C Hamano2012-07-114-3/+57
* | | | | | | | | | | Merge branch 'jc/maint-blame-unique-abbrev' into maintJunio C Hamano2012-07-111-4/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: compute abbreviation width that ensures uniquenessJunio C Hamano2012-07-021-4/+21
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rj/platform-pread-may-be-thread-unsafe' into maintJunio C Hamano2012-07-112-2/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | index-pack: Disable threading on cygwinJunio C Hamano2012-06-262-2/+10
* | | | | | | | | | | | Merge branch 'th/diff-no-index-fixes' into maintJunio C Hamano2012-07-115-24/+112
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds ch...Tim Henigan2012-06-222-2/+73
| * | | | | | | | | | | | diff: handle relative paths in no-indexJeff King2012-06-224-22/+39
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |