summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2011-11-012-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | (squash) test for previousJunio C Hamano2011-10-281-0/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | blame.c: Properly initialize strbuf after calling, textconv_object()Sebastian Schuberth2011-10-281-1/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ef/mingw-upload-archive'Junio C Hamano2011-11-017-64/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mingw: poll.h is no longer in sys/Erik Faye-Lund2011-11-011-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upload-archive: use start_command instead of forkErik Faye-Lund2011-10-304-55/+31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compat/win32/poll.c: upgrade from upstreamErik Faye-Lund2011-10-301-6/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mingw: move poll out of sys-folderErik Faye-Lund2011-10-303-2/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dm/pack-objects-update'Junio C Hamano2011-11-011-19/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pack-objects: don't traverse objects unnecessarilyDan McGee2011-10-201-6/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pack-objects: rewrite add_descendants_to_write_order() iterativelyDan McGee2011-10-181-7/+37
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pack-objects: use unsigned int for counter and offset valuesDan McGee2011-10-181-6/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pack-objects: mark add_to_write_order() as inlineDan McGee2011-10-181-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/pretty-commit-log-message'Junio C Hamano2011-11-011-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty.c: use original commit message if reencoding failsnd/pretty-commit-log-messageNguyễn Thái Ngọc Duy2011-10-231-1/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty.c: free get_header() return valueNguyễn Thái Ngọc Duy2011-10-231-4/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn: Quote repository root in regex matchTed Percival2011-11-011-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 1.7.8-rc0v1.7.8-rc0Junio C Hamano2011-10-302-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/git-tricks'Junio C Hamano2011-10-305-0/+355
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completion: match ctags symbol names in grep patternsJeff King2011-10-211-0/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contrib: add git-jump scriptJeff King2011-10-212-0/+161
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contrib: add diff highlight scriptJeff King2011-10-182-0/+181
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.8Junio C Hamano2011-10-271-3/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sn/complete-bash-wo-process-subst'Junio C Hamano2011-10-271-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completion: fix issue with process substitution not working on Git for WindowsStefan Naewe2011-10-261-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rj/gitweb-clean-js'Junio C Hamano2011-10-271-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb/Makefile: Remove static/gitweb.js in the clean targetrj/gitweb-clean-jsRamsay Jones2011-10-261-1/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/grep-mutex'Junio C Hamano2011-10-271-11/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/grep: simplify lock_and_read_sha1_file()Junio C Hamano2011-10-261-7/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/grep: make lock/unlock into static inline functionsJunio C Hamano2011-10-261-5/+23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git grep: be careful to use mutexes only when they are initializedJohannes Schindelin2011-10-261-4/+5
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-10-273-5/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/maint-estimate-cache-size' into maintJunio C Hamano2011-10-272-3/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'maint'Junio C Hamano2011-10-261-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/gitweb-highlite-sanitise' into maintJunio C Hamano2011-10-261-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/argv-array' into maintJunio C Hamano2011-10-2611-107/+261
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/run-receive-hook-cleanup' into maintJunio C Hamano2011-10-261-19/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cn/eradicate-working-copy' into maintJunio C Hamano2011-10-264-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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6Junio C Hamano2011-10-261-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/mergetool-pathspec' into maint-1.7.6Junio C Hamano2011-10-263-70/+71
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mz/remote-rename' into maint-1.7.6Junio C Hamano2011-10-262-7/+52
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6Junio C Hamano2011-10-261-0/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6Junio C Hamano2011-10-262-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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/sparse-doc' into maint-1.7.6Junio C Hamano2011-10-261-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \