summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/submodule-basic-test'Junio C Hamano2010-05-211-130/+201
|\
| * t7400: clarify submodule update testsJonathan Nieder2010-04-101-95/+91
| * t7400: clarify 'submodule add' testsJonathan Nieder2010-04-101-15/+88
| * t7400: split setup into multiple testsJonathan Nieder2010-04-101-28/+30
* | Merge branch 'np/index-pack-memsave'Junio C Hamano2010-05-211-44/+45
|\ \
| * | index-pack: smarter memory usage when appending objectsNicolas Pitre2010-04-121-12/+12
| * | index-pack: rationalize unpack_entry_data()Nicolas Pitre2010-04-121-11/+8
| * | index-pack: smarter memory usage when resolving deltasNicolas Pitre2010-04-121-21/+25
* | | Merge branch 'jc/am-3-show-corrupted-patch'Junio C Hamano2010-05-211-1/+1
|\ \ \
| * | | am -3: recover the diagnostic messages for corrupt patchesJunio C Hamano2010-04-141-1/+1
* | | | Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'Junio C Hamano2010-05-215-19/+92
|\ \ \ \
| * | | | reflog --expire-unreachable: special case entries in "HEAD" reflogJunio C Hamano2010-04-171-10/+59
| * | | | more war on "sleep" in testsJunio C Hamano2010-04-172-7/+15
| * | | | Document gc.<pattern>.reflogexpire variablesJunio C Hamano2010-04-142-2/+18
* | | | | Merge branch 'cw/maint-exec-defpath'Junio C Hamano2010-05-215-1/+28
|\ \ \ \ \
| * | | | | autoconf: Check if <paths.h> exists and set HAVE_PATHS_HJakub Narebski2010-04-152-0/+7
| * | | | | exec_cmd.c: replace hard-coded path list with one from <paths.h>Chris Webb2010-04-153-1/+21
* | | | | | Merge branch 'tr/word-diff'Junio C Hamano2010-05-217-54/+288
|\ \ \ \ \ \
| * | | | | | diff: add --word-diff option that generalizes --color-wordsThomas Rast2010-04-147-54/+288
* | | | | | | Merge branch 'sp/maint-describe-tiebreak-with-tagger-date'Junio C Hamano2010-05-214-33/+97
|\ \ \ \ \ \ \
| * | | | | | | describe: Break annotated tag ties by tagger dateShawn O. Pearce2010-04-132-7/+50
| * | | | | | | tag.c: Parse tagger date (if present)Shawn O. Pearce2010-04-122-0/+23
| * | | | | | | tag.c: Refactor parse_tag_buffer to be saner to programShawn O. Pearce2010-04-121-22/+21
| * | | | | | | tag.h: Remove unused signature fieldShawn O. Pearce2010-04-121-1/+0
| * | | | | | | tag.c: Correct indentationShawn O. Pearce2010-04-121-3/+3
* | | | | | | | Merge branch 'jc/status-show-ignored'Junio C Hamano2010-05-213-18/+55
|\ \ \ \ \ \ \ \
| * | | | | | | | wt-status: fix 'fprintf' compilation warningJunio C Hamano2010-05-011-1/+1
| * | | | | | | | status: --ignored option shows ignored filesJunio C Hamano2010-04-102-8/+20
| * | | | | | | | wt-status: rename and restructure status-print-untrackedJunio C Hamano2010-04-101-8/+14
| * | | | | | | | wt-status: collect ignored filesJunio C Hamano2010-04-102-0/+18
| * | | | | | | | wt-status: plug memory leak while collecting untracked filesJunio C Hamano2010-04-101-0/+3
| * | | | | | | | wt-status: remove unused workdir_untracked memberJunio C Hamano2010-04-102-2/+0
* | | | | | | | | Merge branch 'np/malloc-threading'Junio C Hamano2010-05-217-8/+54
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Thread-safe xmalloc and xrealloc needs a recursive mutexJohannes Sixt2010-04-085-4/+27
| * | | | | | | | | Make xmalloc and xrealloc thread-safeNicolas Pitre2010-03-243-4/+27
* | | | | | | | | | Merge branch 'sr/remote-helper-export'Junio C Hamano2010-05-2111-27/+671
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t5800: testgit helper requires Python supportJonathan Nieder2010-04-121-0/+6
| * | | | | | | | | | Makefile: Simplify handling of python scriptsBrian Gernhardt2010-04-092-8/+4
| * | | | | | | | | | remote-helpers: add tests for testgit helperSverre Rabbelier2010-04-041-0/+70
| * | | | | | | | | | remote-helpers: add testgit helperSverre Rabbelier2010-03-317-0/+456
| * | | | | | | | | | remote-helpers: add support for an export commandSverre Rabbelier2010-03-311-12/+120
| * | | | | | | | | | remote-helpers: allow requesing the path to the .git directorySverre Rabbelier2010-03-311-0/+5
| * | | | | | | | | | fast-import: always create marks_file directoriesSverre Rabbelier2010-03-311-0/+2
| * | | | | | | | | | clone: also configure url for bare clonesSverre Rabbelier2010-03-311-4/+4
| * | | | | | | | | | clone: pass the remote name to remote_getSverre Rabbelier2010-03-311-4/+4
* | | | | | | | | | | Merge branch 'ld/discovery-limit-to-fs' (early part)Junio C Hamano2010-05-214-2/+40
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEMJunio C Hamano2010-04-042-7/+7
| * | | | | | | | | | | GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundariesJunio C Hamano2010-04-042-6/+10
| * | | | | | | | | | | Add support for GIT_ONE_FILESYSTEMLars R. Damerow2010-03-282-0/+31
| * | | | | | | | | | | truncate cwd string before printing error messageLars R. Damerow2010-03-281-1/+3