Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mz/push-verbose' | Junio C Hamano | 2008-08-20 | 1 | -2/+11 |
|\ | |||||
| * | Make push more verbose about illegal combination of options | Marek Zawirski | 2008-08-17 | 1 | -2/+11 |
* | | Merge branch 'jc/index-extended-flags' | Junio C Hamano | 2008-08-20 | 2 | -0/+5 |
|\ \ | |||||
| * | | index: future proof for "extended" index entries | Junio C Hamano | 2008-08-17 | 2 | -0/+5 |
| |/ | |||||
* | | Merge branch 'cc/merge-base-many' | Junio C Hamano | 2008-08-20 | 5 | -28/+133 |
|\ \ | |||||
| * | | git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge | Junio C Hamano | 2008-07-30 | 1 | -9/+2 |
| * | | merge-base-many: add trivial tests based on the documentation | Junio C Hamano | 2008-07-29 | 1 | -0/+48 |
| * | | documentation: merge-base: explain "git merge-base" with more than 2 args | Junio C Hamano | 2008-07-29 | 1 | -11/+66 |
| * | | merge-base: teach "git merge-base" to drive underlying merge_bases_many() | Christian Couder | 2008-07-29 | 2 | -8/+17 |
* | | | Merge branch 'jc/test-deeper' | Junio C Hamano | 2008-08-20 | 50 | -131/+152 |
|\ \ \ | |||||
| * | | | tests: use $TEST_DIRECTORY to refer to the t/ directory | Junio C Hamano | 2008-08-17 | 51 | -134/+152 |
| | |/ | |/| | |||||
* | | | Merge branch 'js/parallel-test' | Junio C Hamano | 2008-08-20 | 4 | -7/+14 |
|\ \ \ | |||||
| * | | | Update t/.gitignore to ignore all trash directories | Marcus Griep | 2008-08-18 | 1 | -1/+1 |
| * | | | Enable parallel tests | Johannes Schindelin | 2008-08-08 | 2 | -2/+7 |
| * | | | tests: Clarify dependencies between tests, 'aggregate-results' and 'clean' | Johannes Schindelin | 2008-08-08 | 1 | -1/+6 |
| * | | | t9700: remove useless check | Johannes Schindelin | 2008-08-08 | 1 | -3/+0 |
* | | | | Update draft release notes for 1.6.1 | Junio C Hamano | 2008-08-20 | 1 | -5/+21 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2008-08-20 | 18 | -23/+108 |
|\ \ \ \ | |||||
| * | | | | Update draft release notes for 1.6.0.1 | Junio C Hamano | 2008-08-20 | 1 | -2/+18 |
| * | | | | Add hints to revert documentation about other ways to undo changes | Tarmigan Casebolt | 2008-08-20 | 1 | -0/+9 |
| * | | | | Install templates with the user and group of the installing personality | Johannes Sixt | 2008-08-20 | 1 | -1/+1 |
| * | | | | "git-merge": allow fast-forwarding in a stat-dirty tree | Junio C Hamano | 2008-08-20 | 2 | -1/+11 |
| * | | | | completion: find out supported merge strategies correctly | Junio C Hamano | 2008-08-20 | 1 | -6/+8 |
| * | | | | decorate: allow const objects to be decorated | Jeff King | 2008-08-20 | 2 | -8/+9 |
| * | | | | for-each-ref: cope with tags with incomplete lines | Junio C Hamano | 2008-08-20 | 2 | -1/+13 |
| * | | | | diff --check: do not get confused by new blank lines in the middle | Junio C Hamano | 2008-08-20 | 2 | -0/+12 |
| * | | | | remote.c: remove useless if-before-free test | Jim Meyering | 2008-08-19 | 1 | -2/+1 |
| * | | | | mailinfo: avoid violating strbuf assertion | Jeff King | 2008-08-19 | 4 | -1/+25 |
| * | | | | git format-patch: avoid underrun when format.headers is empty or all NLs | Jim Meyering | 2008-08-19 | 1 | -1/+1 |
* | | | | | Merge branch 'bd/diff-strbuf' | Junio C Hamano | 2008-08-19 | 5 | -71/+53 |
|\ \ \ \ \ | |||||
| * | | | | | xdiff-interface: hide the whole "xdiff_emit_state" business from the caller | Junio C Hamano | 2008-08-14 | 5 | -39/+33 |
| * | | | | | Use strbuf for struct xdiff_emit_state's remainder | Brian Downing | 2008-08-13 | 2 | -24/+12 |
| * | | | | | Make xdi_diff_outf interface for running xdiff_outf diffs | Brian Downing | 2008-08-13 | 5 | -23/+23 |
* | | | | | | Merge branch 'dp/hash-literally' | Junio C Hamano | 2008-08-19 | 5 | -122/+178 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add --no-filters option to git hash-object | Dmitry Potapov | 2008-08-03 | 3 | -5/+44 |
| * | | | | | | add --path option to git hash-object | Dmitry Potapov | 2008-08-03 | 3 | -7/+48 |
| * | | | | | | use parse_options() in git hash-object | Dmitry Potapov | 2008-08-03 | 1 | -69/+53 |
| * | | | | | | correct usage help string for git-hash-object | Dmitry Potapov | 2008-08-03 | 2 | -2/+5 |
| * | | | | | | correct argument checking test for git hash-object | Dmitry Potapov | 2008-08-03 | 1 | -4/+4 |
| * | | | | | | teach index_fd to work with pipes | Dmitry Potapov | 2008-08-03 | 3 | -52/+41 |
* | | | | | | | Merge branch 'js/checkout-dwim-local' | Junio C Hamano | 2008-08-19 | 3 | -4/+38 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | checkout --track: make up a sensible branch name if '-b' was omitted | Johannes Schindelin | 2008-08-11 | 3 | -4/+38 |
* | | | | | | | | Merge branch 'ph/enable-threaded' | Junio C Hamano | 2008-08-19 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Enable threaded delta search on *BSD and Linux. | Pierre Habouzit | 2008-07-22 | 1 | -0/+5 |
* | | | | | | | | | Merge branch 'jk/pager-swap' | Junio C Hamano | 2008-08-19 | 3 | -44/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | spawn pager via run_command interface | Jeff King | 2008-07-25 | 1 | -44/+11 |
| * | | | | | | | | | run-command: add pre-exec callback | Jeff King | 2008-07-25 | 2 | -0/+3 |
* | | | | | | | | | | Merge branch 'rs/imap' | Junio C Hamano | 2008-08-19 | 4 | -423/+586 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Documentation: Improve documentation for git-imap-send(1) | Robert Shearman | 2008-07-25 | 1 | -12/+65 |
| * | | | | | | | | | | imap-send.c: more style fixes | Junio C Hamano | 2008-07-25 | 1 | -114/+111 |