summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2008-10-318-27/+99
|\
| * git-svn: change dashed git-commit-tree to git commit-treeDeskin Miller2008-10-311-1/+1
| * Documentation: clarify information about 'ident' attributeJan Krüger2008-10-311-2/+2
| * bash completion: add doubledash to "git show"Markus Heidelberg2008-10-311-0/+2
| * Use test-chmtime -v instead of perl in t5000 to get mtime of a fileAlex Riesen2008-10-311-1/+1
| * Add --verbose|-v to test-chmtimeAlex Riesen2008-10-311-21/+70
| * asciidoc: add minor workaround to add an empty line after code blocksJonas Fonseca2008-10-301-0/+20
| * Plug a memleak in builtin-revertAlex Riesen2008-10-301-1/+2
| * Add file delete/create info when we overflow rename_limitLinus Torvalds2008-10-281-1/+1
| * Install git-cvsserver in $(bindir)Nanako Shiraishi2008-10-281-1/+1
| * Install git-shell in bindir, tooTommi Virtanen2008-10-281-1/+1
* | compat/cygwin.c: make runtime detection of lstat/stat lessor impactJunio C Hamano2008-10-281-7/+13
* | Merge branch 'maint'Junio C Hamano2008-10-265-5/+31
|\ \ | |/
| * add -p: warn if only binary changes presentThomas Rast2008-10-261-2/+7
| * git-archive: work in bare reposCharles Bailey2008-10-263-2/+23
| * git-svn: change dashed git-config to git configDeskin Miller2008-10-241-1/+1
* | receive-pack: fix "borrowing from alternate object store" implementationJunio C Hamano2008-10-261-2/+7
* | git-daemon: set REMOTE_ADDR to client addressJoey Hess2008-10-242-0/+13
* | submodule: fix some non-portable grep invocationsJeff King2008-10-221-2/+2
* | git-remote: list branches in vertical listsJohannes Sixt2008-10-223-12/+17
* | rm: loosen safety valve for empty filesJeff King2008-10-224-2/+17
* | Merge branch 'jk/diff-convfilter'Junio C Hamano2008-10-216-247/+290
|\ \
| * | diff: add filter for converting binary to textJeff King2008-10-183-2/+50
| * | diff: introduce diff.<driver>.binaryJeff King2008-10-184-38/+45
| * | diff: unify external diff and funcname parsing codeJeff King2008-10-184-224/+212
| * | t4012: use test_cmp instead of cmpJeff King2008-10-181-2/+2
* | | Merge branch 'js/maint-fetch-update-head'Junio C Hamano2008-10-217-5/+44
|\ \ \
| * | | pull: allow "git pull origin $something:$current_branch" into an unborn branchJunio C Hamano2008-10-172-2/+14
| * | | Fix fetch/pull when run without --update-head-okJohannes Schindelin2008-10-135-3/+30
* | | | Merge branch 'jc/maint-co-track'Junio C Hamano2008-10-2112-29/+62
|\ \ \ \
| * | | | Enhance hold_lock_file_for_{update,append}() APIJunio C Hamano2008-10-1911-23/+39
| * | | | demonstrate breakage of detached checkout with symbolic link HEADJunio C Hamano2008-10-191-0/+12
| * | | | Fix "checkout --track -b newbranch" on detached HEADJunio C Hamano2008-10-172-7/+11
* | | | | Merge branch 'rs/alloc-ref'Junio C Hamano2008-10-217-43/+30
|\ \ \ \ \
| * | | | | make alloc_ref_from_str() the new alloc_ref()René Scharfe2008-10-187-27/+18
| * | | | | use alloc_ref_from_str() everywhereRené Scharfe2008-10-183-8/+4
| * | | | | add alloc_ref_with_prefix()René Scharfe2008-10-181-16/+16
* | | | | | Merge branch 'jk/fix-ls-files-other'Junio C Hamano2008-10-215-44/+39
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-otherJunio C Hamano2008-10-175-44/+39
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | refactor handling of "other" files in ls-files and statusJeff King2008-10-175-44/+40
| | |/ / / /
* | | | | | Merge branch 'jc/maint-reset-remove-unmerged-new'Junio C Hamano2008-10-212-13/+78
|\ \ \ \ \ \
| * | | | | | reset --hard/read-tree --reset -u: remove unmerged new pathsJunio C Hamano2008-10-182-13/+78
* | | | | | | Merge branch 'maint'Junio C Hamano2008-10-213-12/+35
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | GIT 1.6.0.3v1.6.0.3Junio C Hamano2008-10-211-9/+6
| * | | | | | rehabilitate 'git index-pack' inside the object storeNicolas Pitre2008-10-212-3/+29
* | | | | | | Merge branch 'maint'Junio C Hamano2008-10-201-4/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix testcase failure when extended attributes are in useJunio C Hamano2008-10-191-4/+6
* | | | | | | workflows documentation: fix link to git-request-pull[1]Lee Marlow2008-10-201-1/+1
* | | | | | | bash completion: Add 'workflows' to 'git help'Lee Marlow2008-10-201-0/+1
* | | | | | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-10-205-1067/+1340
|\ \ \ \ \ \ \