summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ar/maint-mksnpath' into ar/mksnpathJunio C Hamano2008-10-3011-15/+60
|\
| * Use git_pathdup instead of xstrdup(git_path(...))Alex Riesen2008-10-309-12/+12
| * git_pathdup: returns xstrdup-ed copy of the formatted pathAlex Riesen2008-10-302-4/+22
| * Fix potentially dangerous use of git_path in ref.cAlex Riesen2008-10-301-3/+5
| * Add git_snpath: a .git path formatting routine with output bufferAlex Riesen2008-10-302-0/+25
* | Fix potentially dangerous uses of mkpath and git_pathAlex Riesen2008-10-261-2/+4
* | Merge branch 'ar/maint-mksnpath' into HEADJunio C Hamano2008-10-264-4/+24
|\ \ | |/
| * Fix potentially dangerous uses of mkpath and git_pathAlex Riesen2008-10-261-2/+2
| * Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.cAlex Riesen2008-10-261-2/+4
| * Add mksnpath which allows you to specify the output bufferAlex Riesen2008-10-262-0/+18
* | 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
|\ \ \ \ \ \ \
| * | | | | | | gitk: Turn short SHA1 names into links tooPaul Mackerras2008-10-211-30/+77
| * | | | | | | gitk: Regenerate .po filesPaul Mackerras2008-10-185-966/+1037
View Lorry Controller Status