Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rr/rebase-reflog-message-reword' | Junio C Hamano | 2013-07-18 | 3 | -3/+26 |
|\ | |||||
| * | rebase -i: use a better reflog message | Ramkumar Ramachandra | 2013-06-23 | 2 | -1/+20 |
| * | rebase: use a better reflog message | Ramkumar Ramachandra | 2013-06-23 | 1 | -2/+6 |
* | | git-log.txt: fix typesetting of example "git-log -L" invocation | Eric Sunshine | 2013-07-17 | 1 | -1/+1 |
* | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-07-15 | 1 | -29/+29 |
* | | Sync with 1.8.3.3 | Junio C Hamano | 2013-07-15 | 2 | -1/+23 |
|\ \ | |||||
| * | | Git 1.8.3.3v1.8.3.3 | Junio C Hamano | 2013-07-15 | 3 | -2/+24 |
| * | | Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maint | Junio C Hamano | 2013-07-15 | 2 | -1/+15 |
| |\ \ | |||||
| * \ \ | Merge branch 'bc/http-keep-memory-given-to-curl' into maint | Junio C Hamano | 2013-07-15 | 1 | -3/+9 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/pull-into-dirty-unborn' into maint | Junio C Hamano | 2013-07-15 | 2 | -2/+38 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'fg/submodule-non-ascii-path' into maint | Junio C Hamano | 2013-07-15 | 2 | -1/+17 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'fc/sequencer-plug-leak' into maint | Junio C Hamano | 2013-07-15 | 1 | -7/+11 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'mt/send-email-cc-match-fix' into maint | Junio C Hamano | 2013-07-15 | 2 | -9/+106 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'bc/send-email-use-port-as-separate-param' | Junio C Hamano | 2013-07-15 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | send-email: provide port separately from hostnamebc/send-email-use-port-as-separate-param | brian m. carlson | 2013-07-04 | 1 | -2/+4 |
* | | | | | | | | | | Merge branch 'fg/submodule-clone-depth' | Junio C Hamano | 2013-07-15 | 4 | -12/+62 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add --depth to submodule update/addfg/submodule-clone-depth | Fredrik Gustafsson | 2013-07-03 | 4 | -12/+61 |
* | | | | | | | | | | | Merge branch 'cp/submodule-custom-update' | Junio C Hamano | 2013-07-15 | 3 | -1/+38 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | submodule update: allow custom command to update submodule working treecp/submodule-custom-update | Chris Packham | 2013-07-03 | 3 | -1/+38 |
* | | | | | | | | | | | | Merge branch 'jk/format-patch-from' | Junio C Hamano | 2013-07-15 | 7 | -9/+145 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | teach format-patch to place other authors into in-body "From" | Jeff King | 2013-07-03 | 7 | -0/+128 |
| * | | | | | | | | | | | | pretty.c: drop const-ness from pretty_print_context | Jeff King | 2013-07-03 | 2 | -9/+17 |
* | | | | | | | | | | | | | Merge branch 'mv/merge-ff-tristate' | Junio C Hamano | 2013-07-15 | 2 | -25/+42 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | merge: handle --ff/--no-ff/--ff-only as a tri-state option | Miklos Vajna | 2013-07-02 | 2 | -25/+42 |
* | | | | | | | | | | | | | | Merge branch 'jk/fetch-pack-many-refs' | Junio C Hamano | 2013-07-15 | 3 | -9/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | fetch-pack: avoid quadratic behavior in rev_list_pushjk/fetch-pack-many-refs | Jeff King | 2013-07-02 | 1 | -7/+6 |
| * | | | | | | | | | | | | | | commit.c: make compare_commits_by_commit_date global | Jeff King | 2013-07-02 | 2 | -1/+3 |
| * | | | | | | | | | | | | | | fetch-pack: avoid quadratic list insertion in mark_complete | Jeff King | 2013-07-02 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | Update draft release notes for 1.8.4 | Junio C Hamano | 2013-07-12 | 1 | -0/+7 |
* | | | | | | | | | | | | | | | Merge branch 'jc/remote-http-argv-array' | Junio C Hamano | 2013-07-12 | 1 | -16/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | remote-http: use argv-arrayjc/remote-http-argv-array | Junio C Hamano | 2013-07-09 | 1 | -16/+16 |
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'rs/pickaxe-simplify' | Junio C Hamano | 2013-07-12 | 1 | -7/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | diffcore-pickaxe: simplify has_changes and containsrs/pickaxe-simplify | René Scharfe | 2013-07-07 | 1 | -7/+4 |
* | | | | | | | | | | | | | | | | Merge branch 'tr/test-lint-no-export-assignment-in-shell' | Junio C Hamano | 2013-07-12 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | test-lint: detect 'export FOO=bar' | Thomas Rast | 2013-07-08 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | t9902: fix 'test A == B' to use = operator | Thomas Rast | 2013-07-08 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'rr/name-rev-stdin-doc' | Junio C Hamano | 2013-07-12 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | name-rev doc: rewrite --stdin paragraph | Ramkumar Ramachandra | 2013-07-07 | 1 | -2/+4 |
* | | | | | | | | | | | | | | | | | Merge branch 'ft/diff-rename-default-score-is-half' | Junio C Hamano | 2013-07-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | diff-options: document default similarity index | Fraser Tweedale | 2013-07-05 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Merge branch 'ml/cygwin-does-not-have-fifo' | Junio C Hamano | 2013-07-12 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | test-lib.sh - cygwin does not have usable FIFOsml/cygwin-does-not-have-fifo | Mark Levedahl | 2013-07-05 | 1 | -1/+8 |
| | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'tf/gitweb-extra-breadcrumbs' | Junio C Hamano | 2013-07-12 | 2 | -3/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | gitweb: allow extra breadcrumbs to prefix the trailtf/gitweb-extra-breadcrumbs | Tony Finch | 2013-07-04 | 2 | -3/+26 |
| | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'ms/remote-tracking-branches-in-doc' | Junio C Hamano | 2013-07-12 | 6 | -14/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Change "remote tracking" to "remote-tracking"ms/remote-tracking-branches-in-doc | Michael Schubert | 2013-07-03 | 6 | -14/+17 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pull-to-integrate' | Junio C Hamano | 2013-07-12 | 3 | -8/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | pull: change the description to "integrate" changesjk/pull-to-integrate | John Keeping | 2013-07-08 | 2 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | push: avoid suggesting "merging" remote changes | John Keeping | 2013-07-07 | 1 | -6/+6 |
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-config-multi-order' | Junio C Hamano | 2013-07-12 | 1 | -8/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |