summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge branch 'mh/maint-revisions-doc' into maintJunio C Hamano2012-08-061-6/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Enumerate revision range specifiers in the documentationJunio C Hamano2012-07-241-0/+31
| * | | | | | | | | | | | | | Make <refname> documentation more consistent.Max Horn2012-07-051-6/+6
* | | | | | | | | | | | | | | Merge branch 'jc/mergetool-tool-help' into maintJunio C Hamano2012-08-063-5/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | mergetool: support --tool-help option like difftool doesJunio C Hamano2012-07-233-5/+49
* | | | | | | | | | | | | | | Git 1.7.11.4v1.7.11.4Junio C Hamano2012-07-304-3/+35
* | | | | | | | | | | | | | | Merge branch 'jk/maint-commit-document-editmsg' into maintJunio C Hamano2012-07-301-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | commit: document the temporary commit message fileJeff King2012-07-231-0/+9
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'jk/maint-advise-vaddf' into maintJunio C Hamano2012-07-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | advice: pass varargs to strbuf_vaddf, not strbuf_addfJeff King2012-07-231-1/+1
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'kk/maint-commit-tree' into maintJunio C Hamano2012-07-303-4/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Revert "git-commit-tree(1): update synopsis"Junio C Hamano2012-07-171-1/+1
| * | | | | | | | | | | | | | | Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-treeJunio C Hamano2012-07-172-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | commit-tree: resurrect command line parsing updatesJunio C Hamano2012-07-172-3/+17
* | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \