summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maintJunio C Hamano2009-05-061-1/+1
|\
| * git-svn: fix a sloppy Getopt::Long usageRobin H. Johnson2009-05-061-1/+1
* | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-05-061-2/+2
|\ \
| * | dir.c: Fix two minor grammatical errors in commentsAllan Caffee2009-05-061-2/+2
| |/
* | improve error message in config.cAlex Riesen2009-05-061-1/+1
* | t4018-diff-funcname: add cpp xfuncname pattern to syntax testBrandon Casey2009-05-061-1/+1
* | Work around BSD whose typeof(tv.tv_sec) != time_tBernd Ahlers2009-05-061-1/+3
* | git-am.txt: reword extra headers in message bodyStephen Boyd2009-05-061-4/+4
* | git-am.txt: Use date or value instead of time or timestampStephen Boyd2009-05-061-4/+4
* | git-am.txt: add an 'a', say what 'it' is, simplify a sentenceStephen Boyd2009-05-061-6/+6
* | GIT 1.6.2.5v1.6.2.5Junio C Hamano2009-05-043-2/+23
* | Merge branch 'np/maint-no-ofs-delta' into maintJunio C Hamano2009-05-041-1/+12
|\ \
| * | honor repack.usedeltabaseoffset when fetching packsNicolas Pitre2009-05-021-1/+12
* | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-05-041-0/+25
|\ \ \
| * | | GIT 1.6.1.4v1.6.1.4Junio C Hamano2009-05-042-1/+26
| * | | Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1Junio C Hamano2009-05-0411-74/+105
| |\ \ \
| * \ \ \ Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1Junio C Hamano2009-05-042-1/+17
| |\ \ \ \
| * \ \ \ \ Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1Junio C Hamano2009-05-044-5/+29
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jc/maint-read-tree-multi' into maintJunio C Hamano2009-05-044-41/+55
|\ \ \ \ \ \ \
| * | | | | | | checkout branch: prime cache-tree fullyJunio C Hamano2009-04-201-1/+8
| * | | | | | | read-tree -m A B: prime cache-tree from the switched-to treeJunio C Hamano2009-04-201-0/+5
| * | | | | | | Move prime_cache_tree() to cache-tree.cJunio C Hamano2009-04-204-36/+40
| * | | | | | | read-tree A B: do not corrupt cache-treeJunio C Hamano2009-04-201-4/+2
* | | | | | | | Merge branch 'mk/maint-apply-swap' into maintJunio C Hamano2009-05-042-7/+112
|\ \ \ \ \ \ \ \
| * | | | | | | | tests: make test-apply-criss-cross-rename more robustMichał Kiedrowicz2009-04-201-3/+31
| * | | | | | | | builtin-apply: keep information about files to be deletedMichał Kiedrowicz2009-04-202-8/+47
| * | | | | | | | tests: test applying criss-cross rename patchMichał Kiedrowicz2009-04-201-0/+38
| |/ / / / / / /
* | | | | | | | Merge branch 'mm/maint-add-p-quit' into maintJunio C Hamano2009-05-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | git add -p: add missing "q" to patch promptWincent Colaiuta2009-04-201-1/+1
* | | | | | | | | Merge branch 'lt/pack-object-memuse' into maintJunio C Hamano2009-05-047-43/+56
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | show_object(): push path_name() call further downLinus Torvalds2009-04-137-14/+20
| * | | | | | | | process_{tree,blob}: show objects without bufferingLinus Torvalds2009-04-137-41/+48
* | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-302-12/+65
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-292-12/+65
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | diff -c -p: do not die on submodulesJunio C Hamano2009-04-292-12/+65
* | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-284-4/+12
|\| | | | | | | |
| * | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-284-4/+12
| |\| | | | | | |
| | * | | | | | | grep: fix segfault when "git grep '('" is givenLinus Torvalds2009-04-282-2/+10
| | * | | | | | | Documentation: fix a grammatical error in api-builtin.txtAllan Caffee2009-04-271-1/+1
| | * | | | | | | builtin-merge: fix a typo in an error messageAllan Caffee2009-04-271-1/+1
* | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-251-1/+1
|\| | | | | | | |
| * | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-251-1/+1
| |\| | | | | | |
| | * | | | | | | test-genrandom: Add newline to usage stringStephen Boyd2009-04-231-1/+1
* | | | | | | | | gitcvs-migration: Link to git-cvsimport documentationFrank Lichtenheld2009-04-201-1/+1
* | | | | | | | | Fix off-by-one in read_tree_recursiveJohannes Schindelin2009-04-201-0/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | GIT 1.6.2.4v1.6.2.4Junio C Hamano2009-04-202-2/+10
* | | | | | | | Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtinsNguyễn Thái Ngọc Duy2009-04-201-2/+0
* | | | | | | | Merge branch 'ef/maint-fast-export' into maintJunio C Hamano2009-04-192-2/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin-fast-export.c: handle nested tagsErik Faye-Lund2009-04-192-3/+6
| * | | | | | | | builtin-fast-export.c: fix crash on tagged treesErik Faye-Lund2009-04-192-3/+6