summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'np/pack'Junio C Hamano2008-09-183-11/+27
|\
| * t5300: improve SHA1 collision testNicolas Pitre2008-09-021-1/+2
| * pack-objects: don't include missing preferred base objectsNicolas Pitre2008-09-021-0/+8
| * sha1write: don't copy full sized buffersNicolas Pitre2008-09-021-10/+17
| * Merge branch 'np/maint-safer-pack' into np/packJunio C Hamano2008-09-026-55/+112
| |\
* | \ Merge branch 'bw/shortref'Junio C Hamano2008-09-183-7/+173
|\ \ \
| * | | for-each-ref: `:short` format for `refname`Bert Wesarg2008-09-053-7/+173
* | | | Merge branch 'rs/decorate'Junio C Hamano2008-09-185-28/+60
|\ \ \ \
| * | | | add '%d' pretty format specifier to show decorationRené Scharfe2008-09-042-0/+22
| * | | | move load_ref_decorations() to log-tree.c and export itRené Scharfe2008-09-043-35/+37
| * | | | log: add load_ref_decorations()René Scharfe2008-09-041-2/+10
* | | | | Merge branch 'tr/rev-list-reverse'Junio C Hamano2008-09-183-21/+60
|\ \ \ \ \
| * | | | | t6013: replace use of 'tac' with equivalent PerlThomas Rast2008-08-311-2/+2
| * | | | | rev-list: fix --reverse interaction with --parentsThomas Rast2008-08-293-21/+60
* | | | | | Merge branch 'cc/bisect'Junio C Hamano2008-09-182-27/+260
|\ \ \ \ \ \
| * | | | | | bisect: remove "checkout_done" variable used when checking merge basesChristian Couder2008-09-051-5/+27
| * | | | | | bisect: only check merge bases when neededChristian Couder2008-08-272-14/+58
| * | | | | | bisect: test merge base if good rev is not an ancestor of bad revChristian Couder2008-08-272-25/+192
* | | | | | | Merge branch 'jc/setlinebuf-setvbuf'Junio C Hamano2008-09-181-1/+2
|\ \ \ \ \ \ \
| * | | | | | | daemon.c: avoid setlinebuf()Junio C Hamano2008-09-061-1/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'maint'Junio C Hamano2008-09-1610-31/+34
|\ \ \ \ \ \ \
| * | | | | | | Cosmetical command name fixHeikki Orsila2008-09-151-1/+1
| * | | | | | | Start conforming code to "git subcmd" style part 3Heikki Orsila2008-09-159-19/+19
| * | | | | | | t9700/test.pl: remove File::Temp requirementBrandon Casey2008-09-151-10/+13
| * | | | | | | t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()Brandon Casey2008-09-151-1/+1
* | | | | | | | Merge branch 'dp/maint-rebase-fix'Junio C Hamano2008-09-161-3/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | git-rebase--interactive: auto amend only edited commitDmitry Potapov2008-09-091-1/+5
| * | | | | | | | git-rebase-interactive: do not squash commits on abortDmitry Potapov2008-09-091-2/+6
* | | | | | | | | Merge branch 'jc/maint-checkout-keep-remove'Junio C Hamano2008-09-165-2/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout: do not lose staged removalJunio C Hamano2008-09-095-2/+24
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jc/maint-diff-quiet'Junio C Hamano2008-09-161-11/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff --quiet: make it synonym to --exit-code >/dev/nullJunio C Hamano2008-09-061-10/+0
| * | | | | | | | | diff Porcelain: do not disable auto index refreshing on -C -CJunio C Hamano2008-09-061-1/+1
* | | | | | | | | | Merge branch 'jc/maint-name-hash-clear'Junio C Hamano2008-09-161-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | discard_cache: reset lazy name_hash bitJunio C Hamano2008-08-231-0/+1
* | | | | | | | | | | Merge branch 'jc/maint-template-permbits'Junio C Hamano2008-09-161-3/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix permission bits on sources checked out with an overtight umaskJunio C Hamano2008-09-091-5/+7
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mh/maint-honor-no-ssl-verify'Junio C Hamano2008-09-161-1/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is setJunio C Hamano2008-09-071-1/+10
| |/ / / / / / / / / /
* | | | | | | | | | | Update RPM spec for the new location of git-cvsserver.Quy Tonthat2008-09-151-0/+4
* | | | | | | | | | | Sync with 1.6.0.2Junio C Hamano2008-09-126-6/+11
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | GIT 1.6.0.2v1.6.0.2Junio C Hamano2008-09-122-2/+4
| * | | | | | | | | | Merge branch 'ho/maint-dashless' into maintJunio C Hamano2008-09-125-14/+14
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix some manual typos.Ralf Wildenhues2008-09-123-3/+3
| * | | | | | | | | | | Use compatibility regex library also on FreeBSDJeff King2008-09-111-0/+2
| * | | | | | | | | | | Use compatibility regex library also on AIXJohannes Sixt2008-09-111-0/+2
* | | | | | | | | | | | Install git-cvsserver in $(bindir)Nanako Shiraishi2008-09-101-1/+1
* | | | | | | | | | | | separate build targets for man and html documentationMichael J Gruber2008-09-102-3/+18
* | | | | | | | | | | | allow installation of man and html doc from the man and html branchesMichael J Gruber2008-09-103-0/+13
* | | | | | | | | | | | Fix git-diff-tree --stdinJunio C Hamano2008-09-102-3/+15