summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | read-cache.c: fix index memory allocationRené Scharfe2011-10-262-3/+53
* | | | | | | | | | | | | | | clone: Quote user supplied path in a single quote pairRichard Hartmann2011-10-271-2/+2
* | | | | | | | | | | | | | | Merge branch 'jn/gitweb-highlite-sanitise' into maintJunio C Hamano2011-10-261-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | gitweb: Strip non-printable characters from syntax highlighter outputJakub Narebski2011-09-161-1/+13
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/argv-array' into maintJunio C Hamano2011-10-2611-107/+261
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | run_hook: use argv_array APIJeff King2011-09-141-10/+8
| * | | | | | | | | | | | | | | checkout: use argv_array APIJeff King2011-09-141-19/+8
| * | | | | | | | | | | | | | | bisect: use argv_array APIJeff King2011-09-141-37/+11
| * | | | | | | | | | | | | | | quote: provide sq_dequote_to_argv_arrayJeff King2011-09-142-3/+28
| * | | | | | | | | | | | | | | refactor argv_array into generic codeJeff King2011-09-145-35/+125
| * | | | | | | | | | | | | | | quote.h: fix bogus commentJeff King2011-09-141-3/+2
| * | | | | | | | | | | | | | | add sha1_array API docsJeff King2011-09-141-0/+79
* | | | | | | | | | | | | | | | Merge branch 'jc/run-receive-hook-cleanup' into maintJunio C Hamano2011-10-261-19/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | refactor run_receive_hook()Junio C Hamano2011-09-121-19/+52
* | | | | | | | | | | | | | | | | Merge branch 'cn/eradicate-working-copy' into maintJunio C Hamano2011-10-264-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Remove 'working copy' from the documentation and C codeCarlos Martín Nieto2011-09-214-6/+6
* | | | | | | | | | | | | | | | | | Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-2610-93/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6Junio C Hamano2011-10-261-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | notes_merge_commit(): do not pass temporary buffer to other functionMichael Haggerty2011-09-271-1/+2
| * | | | | | | | | | | | | | | | | | | Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6Junio C Hamano2011-10-261-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | gitweb: Fix links to lines in blobs when javascript-actions are enabledPeter Stuge2011-09-271-4/+4
| * | | | | | | | | | | | | | | | | | | | Merge branch 'jm/mergetool-pathspec' into maint-1.7.6Junio C Hamano2011-10-263-70/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | mergetool: no longer need to save standard inputJunio C Hamano2011-09-261-6/+4
| | * | | | | | | | | | | | | | | | | | | | mergetool: Use args as pathspec to unmerged filesJonathon Mah2011-09-263-69/+72
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'mz/remote-rename' into maint-1.7.6Junio C Hamano2011-10-262-7/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | remote: only update remote-tracking branch if updating refspecMartin von Zweigbergk2011-09-112-4/+9
| | * | | | | | | | | | | | | | | | | | | | | remote rename: warn when refspec was not updatedMartin von Zweigbergk2011-09-111-0/+6
| | * | | | | | | | | | | | | | | | | | | | | remote: "rename o foo" should not rename ref "origin/bar"Martin von Zweigbergk2011-09-112-1/+11
| | * | | | | | | | | | | | | | | | | | | | | remote: write correct fetch spec when renaming remote 'remote'Martin von Zweigbergk2011-09-112-4/+28
| | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6Junio C Hamano2011-10-261-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | t9159-*.sh: skip for mergeinfo test for svn <= 1.4Ramsay Jones2011-09-211-0/+8
| | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6Junio C Hamano2011-10-262-11/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | date.c: Support iso8601 timezone formatsHaitao Li2011-09-122-11/+29
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-267-32/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/doc-note-rewrite' into maint-1.7.6Junio C Hamano2011-10-261-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | Documentation: basic configuration of notes.rewriteRefThomas Rast2011-09-131-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/sparse-doc' into maint-1.7.6Junio C Hamano2011-10-261-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | git-read-tree.txt: update sparse checkout examplesNguyễn Thái Ngọc Duy2011-09-261-2/+2
| | | |/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6Junio C Hamano2011-10-264-25/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | git-read-tree.txt: correct sparse-checkout and skip-worktree descriptionMichael J Gruber2011-09-211-4/+4
| | * | | | | | | | | | | | | | | | | | | | | | | git-read-tree.txt: language and typography fixesMichael J Gruber2011-09-211-20/+20
| | * | | | | | | | | | | | | | | | | | | | | | | unpack-trees: print "Aborting" to stderrMichael J Gruber2011-09-213-1/+7
| | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-1.7.5' into maint-1.7.6Junio C Hamano2011-10-263-5/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-1.7.4' into maint-1.7.5Junio C Hamano2011-10-263-5/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-1.7.3' into maint-1.7.4Junio C Hamano2011-10-263-5/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3Junio C Hamano2011-10-261-2/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | Documentation/git-update-index: refer to 'ls-files'Stefan Naewe2011-09-211-2/+5
| | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | make the sample pre-commit hook script reject names with newlines, tooJim Meyering2011-10-261-2/+6
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-1.7.3' into maintJunio C Hamano2011-10-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | / / / / / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Reindent closing bracket using tab instead of spacesNguyễn Thái Ngọc Duy2011-10-231-1/+1