Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline() | Brandon Casey | 2011-10-18 | 1 | -1/+0 |
* | Prepare for 1.7.7.1 | Junio C Hamano | 2011-10-15 | 2 | -1/+40 |
* | Merge branch 'ms/patch-id-with-overlong-line' into maint | Junio C Hamano | 2011-10-15 | 1 | -4/+6 |
|\ | |||||
| * | patch-id.c: use strbuf instead of a fixed buffer | Michael Schubert | 2011-09-22 | 1 | -4/+6 |
* | | Merge branch 'jc/maint-bundle-too-quiet' into maint | Junio C Hamano | 2011-10-15 | 4 | -5/+10 |
|\ \ | |||||
| * | | Teach progress eye-candy to fetch_refs_from_bundle() | Junio C Hamano | 2011-09-19 | 4 | -5/+10 |
* | | | Merge branch 'jk/filter-branch-require-clean-work-tree' into maint | Junio C Hamano | 2011-10-15 | 1 | -3/+1 |
|\ \ \ | |||||
| * | | | filter-branch: use require_clean_work_tree | Jeff King | 2011-09-15 | 1 | -3/+1 |
* | | | | Merge branch 'jc/maint-fsck-fwrite-size-check' into maint | Junio C Hamano | 2011-10-15 | 1 | -6/+3 |
|\ \ \ \ | |||||
| * | | | | fsck: do not abort upon finding an empty blob | Junio C Hamano | 2011-09-11 | 1 | -6/+3 |
* | | | | | Merge branch 'bk/ancestry-path' into maint | Junio C Hamano | 2011-10-15 | 3 | -10/+101 |
|\ \ \ \ \ | |||||
| * | | | | | t6019: avoid refname collision on case-insensitive systems | Thomas Rast | 2011-09-15 | 1 | -8/+11 |
| * | | | | | revision: do not include sibling history in --ancestry-path output | Junio C Hamano | 2011-08-25 | 2 | -7/+11 |
| * | | | | | revision: keep track of the end-user input from the command line | Junio C Hamano | 2011-08-25 | 2 | -4/+53 |
| * | | | | | rev-list: Demonstrate breakage with --ancestry-path --all | Brad King | 2011-08-25 | 1 | -0/+35 |
* | | | | | | Merge branch 'jk/maint-fetch-submodule-check-fix' into maint | Junio C Hamano | 2011-10-15 | 1 | -5/+72 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fetch: avoid quadratic loop checking for updated submodules | Jeff King | 2011-09-12 | 1 | -5/+72 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'tr/mergetool-valgrind' into maint | Junio C Hamano | 2011-10-15 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Symlink mergetools scriptlets into valgrind wrappers | Thomas Rast | 2011-08-30 | 1 | -0/+2 |
* | | | | | | | Merge branch 'nm/grep-object-sha1-lock' into maint | Junio C Hamano | 2011-10-15 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | grep: Fix race condition in delta_base_cache | Nicolas Morey-Chaisemartin | 2011-08-30 | 1 | -0/+4 |
* | | | | | | | | Merge branch 'jc/diff-index-unpack' into maint | Junio C Hamano | 2011-10-15 | 5 | -6/+38 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff-index: pass pathspec down to unpack-trees machinery | Junio C Hamano | 2011-08-29 | 1 | -0/+1 |
| * | | | | | | | | unpack-trees: allow pruning with pathspec | Junio C Hamano | 2011-08-29 | 2 | -0/+3 |
| * | | | | | | | | traverse_trees(): allow pruning with pathspec | Junio C Hamano | 2011-08-29 | 2 | -6/+34 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'mm/rebase-i-exec-edit' into maint | Junio C Hamano | 2011-10-15 | 2 | -4/+40 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree | Junio C Hamano | 2011-08-26 | 1 | -3/+9 |
| * | | | | | | | | rebase -i: clean error message for --continue after failed exec | Matthieu Moy | 2011-08-26 | 2 | -1/+31 |
* | | | | | | | | | t1304: fall back to $USER if $LOGNAME is not defined | René Scharfe | 2011-10-14 | 1 | -0/+5 |
* | | | | | | | | | Git 1.7.7v1.7.7 | Junio C Hamano | 2011-09-30 | 3 | -10/+6 |
* | | | | | | | | | templates/hooks--*: remove sample hooks without any functionality | Gerrit Pape | 2011-09-27 | 2 | -23/+0 |
* | | | | | | | | | contrib/hooks: adapt comment about Debian install location for contrib hooks | Gerrit Pape | 2011-09-26 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'jc/namespace-doc-with-old-asciidoc' | Junio C Hamano | 2011-09-26 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation/gitnamespaces.txt: cater to older asciidoc | Junio C Hamano | 2011-09-16 | 1 | -0/+7 |
* | | | | | | | | | | Git 1.7.7-rc3v1.7.7-rc3 | Junio C Hamano | 2011-09-23 | 2 | -31/+2 |
* | | | | | | | | | | Merge 1.7.6.4 in | Junio C Hamano | 2011-09-23 | 2 | -1/+34 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Git 1.7.6.4v1.7.6.4 | Junio C Hamano | 2011-09-23 | 4 | -3/+36 |
| * | | | | | | | | | | Merge branch 'cb/maint-ls-files-error-report' into maint | Junio C Hamano | 2011-09-23 | 6 | -10/+90 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | describe: Refresh the index when run with --dirty | Allan Caffee | 2011-09-23 | 1 | -2/+15 |
| * | | | | | | | | | | | Merge branch 'jc/maint-clone-alternates' into maint | Junio C Hamano | 2011-09-23 | 3 | -30/+114 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/maint-clone-gitdir' into maint | Junio C Hamano | 2011-09-23 | 9 | -12/+33 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/check-ref-format-print-normalize' into maint | Junio C Hamano | 2011-09-23 | 3 | -4/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/branch-set-upstream-previous' into maint | Junio C Hamano | 2011-09-23 | 2 | -1/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'gb/maint-am-patch-format-error-message' into maint | Junio C Hamano | 2011-09-23 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | merge-recursive: Do not look at working tree during a virtual ancestor merge | Junio C Hamano | 2011-09-23 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-09-19 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | git-mergetool: check return value from read | Jay Soffian | 2011-09-19 | 2 | -2/+2 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'ph/format-patch-no-color' | Junio C Hamano | 2011-09-19 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | t4014: clean up format.thread config after each test | Jeff King | 2011-09-19 | 1 | -4/+4 |
* | | | | | | | | | | | | | | | | | Git 1.7.7-rc2v1.7.7-rc2 | Junio C Hamano | 2011-09-18 | 2 | -2/+2 |