summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | patch-id.c: use strbuf instead of a fixed bufferMichael Schubert2011-09-221-4/+6
* | | | | | | | Merge branch 'jc/maint-bundle-too-quiet'Junio C Hamano2011-10-054-5/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Teach progress eye-candy to fetch_refs_from_bundle()Junio C Hamano2011-09-194-5/+10
* | | | | | | | | Merge branch 'jk/filter-branch-require-clean-work-tree'Junio C Hamano2011-10-051-3/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | filter-branch: use require_clean_work_treeJeff King2011-09-151-3/+1
* | | | | | | | | | Merge branch 'jc/want-commit'Junio C Hamano2011-10-052-11/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow git merge ":/<pattern>"jc/want-commitJunio C Hamano2011-09-152-11/+14
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/maint-fsck-fwrite-size-check'Junio C Hamano2011-10-051-6/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fsck: do not abort upon finding an empty blobJunio C Hamano2011-09-111-6/+3
* | | | | | | | | | | Merge branch 'bk/ancestry-path'Junio C Hamano2011-10-053-10/+101
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t6019: avoid refname collision on case-insensitive systemsThomas Rast2011-09-151-8/+11
| * | | | | | | | | | | revision: do not include sibling history in --ancestry-path outputJunio C Hamano2011-08-252-7/+11
| * | | | | | | | | | | revision: keep track of the end-user input from the command lineJunio C Hamano2011-08-252-4/+53
| * | | | | | | | | | | rev-list: Demonstrate breakage with --ancestry-path --allBrad King2011-08-251-0/+35
* | | | | | | | | | | | Merge branch 'jk/maint-fetch-submodule-check-fix'Junio C Hamano2011-10-051-5/+72
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fetch: avoid quadratic loop checking for updated submodulesJeff King2011-09-121-5/+72
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'tr/mergetool-valgrind'Junio C Hamano2011-10-051-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Symlink mergetools scriptlets into valgrind wrappersThomas Rast2011-08-301-0/+2
* | | | | | | | | | | | | Merge branch 'nm/grep-object-sha1-lock'Junio C Hamano2011-10-051-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | grep: Fix race condition in delta_base_cacheNicolas Morey-Chaisemartin2011-08-301-0/+4
* | | | | | | | | | | | | | Merge branch 'jc/diff-index-unpack'Junio C Hamano2011-10-055-6/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | diff-index: pass pathspec down to unpack-trees machineryJunio C Hamano2011-08-291-0/+1
| * | | | | | | | | | | | | | unpack-trees: allow pruning with pathspecJunio C Hamano2011-08-292-0/+3
| * | | | | | | | | | | | | | traverse_trees(): allow pruning with pathspecJunio C Hamano2011-08-292-6/+34
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mm/rebase-i-exec-edit'Junio C Hamano2011-10-052-4/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rebase -i: notice and warn if "exec $cmd" modifies the index or the working treeJunio C Hamano2011-08-261-3/+9
| * | | | | | | | | | | | | | rebase -i: clean error message for --continue after failed execMatthieu Moy2011-08-262-1/+31
* | | | | | | | | | | | | | | Git 1.7.7v1.7.7Junio C Hamano2011-09-303-10/+6
* | | | | | | | | | | | | | | templates/hooks--*: remove sample hooks without any functionalityGerrit Pape2011-09-272-23/+0
* | | | | | | | | | | | | | | contrib/hooks: adapt comment about Debian install location for contrib hooksGerrit Pape2011-09-261-2/+2
* | | | | | | | | | | | | | | Merge branch 'jc/namespace-doc-with-old-asciidoc'Junio C Hamano2011-09-261-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Documentation/gitnamespaces.txt: cater to older asciidocJunio C Hamano2011-09-161-0/+7
* | | | | | | | | | | | | | | | Git 1.7.7-rc3v1.7.7-rc3Junio C Hamano2011-09-232-31/+2
* | | | | | | | | | | | | | | | Merge 1.7.6.4 inJunio C Hamano2011-09-232-1/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Git 1.7.6.4v1.7.6.4Junio C Hamano2011-09-234-3/+36
| * | | | | | | | | | | | | | | | Merge branch 'cb/maint-ls-files-error-report' into maintJunio C Hamano2011-09-236-10/+90
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | describe: Refresh the index when run with --dirtyAllan Caffee2011-09-231-2/+15
| * | | | | | | | | | | | | | | | | Merge branch 'jc/maint-clone-alternates' into maintJunio C Hamano2011-09-233-30/+114
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/maint-clone-gitdir' into maintJunio C Hamano2011-09-239-12/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/check-ref-format-print-normalize' into maintJunio C Hamano2011-09-233-4/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/branch-set-upstream-previous' into maintJunio C Hamano2011-09-232-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gb/maint-am-patch-format-error-message' into maintJunio C Hamano2011-09-231-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | merge-recursive: Do not look at working tree during a virtual ancestor mergeJunio C Hamano2011-09-231-1/+1
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-09-192-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | git-mergetool: check return value from readJay Soffian2011-09-192-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ph/format-patch-no-color'Junio C Hamano2011-09-191-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | t4014: clean up format.thread config after each testJeff King2011-09-191-4/+4
* | | | | | | | | | | | | | | | | | | | | | | Git 1.7.7-rc2v1.7.7-rc2Junio C Hamano2011-09-182-2/+2
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-09-165-12/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | branch --set-upstream: regression fixJunio C Hamano2011-09-165-12/+39