summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/dashless'Junio C Hamano2008-07-16139-335/+350
|\
| * Make usage strings dash-lessStephan Beyer2008-07-1380-101/+102
| * t/: Use "test_must_fail git" instead of "! git"Stephan Beyer2008-07-1358-233/+247
| * t/test-lib.sh: exit with small negagive int is ok with test_must_failStephan Beyer2008-07-131-1/+1
* | Merge branch 'rs/archive'Junio C Hamano2008-07-1612-274/+208
|\ \
| * | archive: remove extra arguments parsing codeRené Scharfe2008-07-153-31/+17
| * | archive: unify file attribute handlingRené Scharfe2008-07-152-43/+23
| * | archive: centralize archive entry writingRené Scharfe2008-07-154-154/+133
| * | archive: add baselen member to struct archiver_argsRené Scharfe2008-07-154-10/+8
| * | add context pointer to read_tree_recursive()René Scharfe2008-07-158-26/+28
| * | archive: remove args member from struct archiverRené Scharfe2008-07-153-39/+28
* | | Merge branch 'ag/blame'Junio C Hamano2008-07-161-5/+28
|\ \ \
| * | | Do not try to detect move/copy for entries below threshold.Alexander Gavrilov2008-07-151-5/+11
| * | | Avoid rescanning unchanged entries in search for copies.Alexander Gavrilov2008-07-151-2/+19
* | | | Merge branch 'rs/rebase-checkout-not-so-quiet'Junio C Hamano2008-07-161-2/+1
|\ \ \ \
| * | | | git-rebase: report checkout failureJunio C Hamano2008-07-141-3/+1
| | |/ / | |/| |
* | | | Merge branch 'sp/maint-index-pack'Junio C Hamano2008-07-161-29/+113
|\ \ \ \
| * | | | index-pack: Honor core.deltaBaseCacheLimit when resolving deltasShawn O. Pearce2008-07-151-2/+46
| * | | | index-pack: Track the object_entry that creates each base_dataShawn O. Pearce2008-07-151-6/+12
| * | | | index-pack: Chain the struct base_data on the stack for traversalShawn O. Pearce2008-07-151-3/+31
| * | | | index-pack: Refactor base arguments of resolve_delta into a structShawn O. Pearce2008-07-151-27/+33
* | | | | Merge branch 'maint'Junio C Hamano2008-07-1613-88/+124
|\ \ \ \ \
| * | | | | Start preparing 1.5.6.4 release notesJunio C Hamano2008-07-162-1/+44
| * | | | | git fetch-pack: do not complain about "no common commits" in an empty repoJohannes Schindelin2008-07-161-1/+2
| * | | | | Merge branch 'js/maint-pretty-mailmap' into maintJunio C Hamano2008-07-162-2/+27
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'sp/maint-bash-completion-optim' into maintJunio C Hamano2008-07-161-18/+50
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sp/maint-pack-memuse' into maintJunio C Hamano2008-07-161-0/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ls/maint-mailinfo-patch-label' into maintJunio C Hamano2008-07-167-2/+104
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/maint-daemon-syslog' into maintJunio C Hamano2008-07-161-20/+50
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase-i: keep old parents when preserving mergesStephan Beyer2008-07-161-0/+2
| * | | | | | | | | | t7600-merge: Use test_expect_failure to test option parsingJohannes Sixt2008-07-161-30/+6
| * | | | | | | | | | Fix buffer overflow in prepare_attr_stackDmitry Potapov2008-07-161-6/+9
| * | | | | | | | | | Fix buffer overflow in git diffDmitry Potapov2008-07-165-25/+34
| * | | | | | | | | | Fix buffer overflow in git-grepDmitry Potapov2008-07-161-12/+15
| * | | | | | | | | | git-cvsserver: fix call to nonexistant cleanupWorkDir()Lars Noschinski2008-07-161-1/+1
| * | | | | | | | | | Documentation/git-cherry-pick.txt et al.: Fix misleading -n descriptionPetr Baudis2008-07-162-13/+13
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | t/Makefile: use specified shell when running aggregation scriptSungHyun Nam2008-07-161-1/+1
* | | | | | | | | | parse-options.c: make check_typos() staticNanako Shiraishi2008-07-161-1/+1
* | | | | | | | | | builtin-describe.c: make a global variable "pattern" staticNanako Shiraishi2008-07-161-1/+1
* | | | | | | | | | cache-tree.c: make cache_tree_find() staticNanako Shiraishi2008-07-162-3/+1
* | | | | | | | | | t/aggregate-results: whitespace fixJunio C Hamano2008-07-161-5/+5
* | | | | | | | | | t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory"Eric Wong2008-07-161-1/+1
* | | | | | | | | | Merge branch 'mv/merge-in-c'Junio C Hamano2008-07-1524-219/+1916
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | reduce_heads(): protect from duplicate inputJunio C Hamano2008-07-142-2/+31
| * | | | | | | | | | reduce_heads(): thinkofixSverre Hvammen Johansen2008-07-132-1/+12
| * | | | | | | | | | Add a new test for git-merge-resolveMiklos Vajna2008-07-131-0/+46
| * | | | | | | | | | t6021: add a new test for git-merge-resolveMiklos Vajna2008-07-131-0/+4
| * | | | | | | | | | Teach merge.log to "git-merge" againJunio C Hamano2008-07-102-0/+9
| * | | | | | | | | | Build in mergeMiklos Vajna2008-07-076-2/+1157
| * | | | | | | | | | Fix t7601-merge-pull-config.sh on AIXMiklos Vajna2008-07-061-7/+7
View Lorry Controller Status