summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mz/push-verbose'Junio C Hamano2008-08-201-2/+11
|\
| * Make push more verbose about illegal combination of optionsMarek Zawirski2008-08-171-2/+11
* | Merge branch 'jc/index-extended-flags'Junio C Hamano2008-08-202-0/+5
|\ \
| * | index: future proof for "extended" index entriesJunio C Hamano2008-08-172-0/+5
| |/
* | Merge branch 'cc/merge-base-many'Junio C Hamano2008-08-205-28/+133
|\ \
| * | git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise mergeJunio C Hamano2008-07-301-9/+2
| * | merge-base-many: add trivial tests based on the documentationJunio C Hamano2008-07-291-0/+48
| * | documentation: merge-base: explain "git merge-base" with more than 2 argsJunio C Hamano2008-07-291-11/+66
| * | merge-base: teach "git merge-base" to drive underlying merge_bases_many()Christian Couder2008-07-292-8/+17
* | | Merge branch 'jc/test-deeper'Junio C Hamano2008-08-2050-131/+152
|\ \ \
| * | | tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano2008-08-1751-134/+152
| | |/ | |/|
* | | Merge branch 'js/parallel-test'Junio C Hamano2008-08-204-7/+14
|\ \ \
| * | | Update t/.gitignore to ignore all trash directoriesMarcus Griep2008-08-181-1/+1
| * | | Enable parallel testsJohannes Schindelin2008-08-082-2/+7
| * | | tests: Clarify dependencies between tests, 'aggregate-results' and 'clean'Johannes Schindelin2008-08-081-1/+6
| * | | t9700: remove useless checkJohannes Schindelin2008-08-081-3/+0
* | | | Update draft release notes for 1.6.1Junio C Hamano2008-08-201-5/+21
* | | | Merge branch 'maint'Junio C Hamano2008-08-2018-23/+108
|\ \ \ \
| * | | | Update draft release notes for 1.6.0.1Junio C Hamano2008-08-201-2/+18
| * | | | Add hints to revert documentation about other ways to undo changesTarmigan Casebolt2008-08-201-0/+9
| * | | | Install templates with the user and group of the installing personalityJohannes Sixt2008-08-201-1/+1
| * | | | "git-merge": allow fast-forwarding in a stat-dirty treeJunio C Hamano2008-08-202-1/+11
| * | | | completion: find out supported merge strategies correctlyJunio C Hamano2008-08-201-6/+8
| * | | | decorate: allow const objects to be decoratedJeff King2008-08-202-8/+9
| * | | | for-each-ref: cope with tags with incomplete linesJunio C Hamano2008-08-202-1/+13
| * | | | diff --check: do not get confused by new blank lines in the middleJunio C Hamano2008-08-202-0/+12
| * | | | remote.c: remove useless if-before-free testJim Meyering2008-08-191-2/+1
| * | | | mailinfo: avoid violating strbuf assertionJeff King2008-08-194-1/+25
| * | | | git format-patch: avoid underrun when format.headers is empty or all NLsJim Meyering2008-08-191-1/+1
* | | | | Merge branch 'bd/diff-strbuf'Junio C Hamano2008-08-195-71/+53
|\ \ \ \ \
| * | | | | xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano2008-08-145-39/+33
| * | | | | Use strbuf for struct xdiff_emit_state's remainderBrian Downing2008-08-132-24/+12
| * | | | | Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing2008-08-135-23/+23
* | | | | | Merge branch 'dp/hash-literally'Junio C Hamano2008-08-195-122/+178
|\ \ \ \ \ \
| * | | | | | add --no-filters option to git hash-objectDmitry Potapov2008-08-033-5/+44
| * | | | | | add --path option to git hash-objectDmitry Potapov2008-08-033-7/+48
| * | | | | | use parse_options() in git hash-objectDmitry Potapov2008-08-031-69/+53
| * | | | | | correct usage help string for git-hash-objectDmitry Potapov2008-08-032-2/+5
| * | | | | | correct argument checking test for git hash-objectDmitry Potapov2008-08-031-4/+4
| * | | | | | teach index_fd to work with pipesDmitry Potapov2008-08-033-52/+41
* | | | | | | Merge branch 'js/checkout-dwim-local'Junio C Hamano2008-08-193-4/+38
|\ \ \ \ \ \ \
| * | | | | | | checkout --track: make up a sensible branch name if '-b' was omittedJohannes Schindelin2008-08-113-4/+38
* | | | | | | | Merge branch 'ph/enable-threaded'Junio C Hamano2008-08-191-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable threaded delta search on *BSD and Linux.Pierre Habouzit2008-07-221-0/+5
* | | | | | | | | Merge branch 'jk/pager-swap'Junio C Hamano2008-08-193-44/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | spawn pager via run_command interfaceJeff King2008-07-251-44/+11
| * | | | | | | | | run-command: add pre-exec callbackJeff King2008-07-252-0/+3
* | | | | | | | | | Merge branch 'rs/imap'Junio C Hamano2008-08-194-423/+586
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation: Improve documentation for git-imap-send(1)Robert Shearman2008-07-251-12/+65
| * | | | | | | | | | imap-send.c: more style fixesJunio C Hamano2008-07-251-114/+111