Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | run-command.c: fix broken list iteration in clear_child_for_cleanup | David Gould | 2012-09-11 | 1 | -6/+7 |
* | run-command: optionally kill children on exit | Jeff King | 2012-01-08 | 2 | -0/+69 |
* | Git 1.7.9-rc0v1.7.9-rc0 | Junio C Hamano | 2012-01-06 | 2 | -1/+8 |
* | Merge branch 'jc/show-sig' | Junio C Hamano | 2012-01-06 | 16 | -34/+488 |
|\ | |||||
| * | log --show-signature: reword the common two-head merge casejc/show-sig | Junio C Hamano | 2012-01-05 | 1 | -0/+12 |
| * | log-tree: show mergetag in log --show-signature output | Junio C Hamano | 2012-01-05 | 1 | -1/+75 |
| * | log-tree.c: small refactor in show_signature() | Junio C Hamano | 2012-01-05 | 1 | -12/+16 |
| * | commit --amend -S: strip existing gpgsig headers | Junio C Hamano | 2012-01-05 | 4 | -8/+36 |
| * | verify_signed_buffer: fix stale comment | Junio C Hamano | 2012-01-05 | 1 | -4/+1 |
| * | Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag' | Junio C Hamano | 2012-01-05 | 15 | -19/+364 |
| |\ | |||||
| | * | gpg-interface: allow use of a custom GPG binaryjc/signed-commit | Junio C Hamano | 2011-11-29 | 3 | -6/+24 |
| | * | pretty: %G[?GS] placeholders | Junio C Hamano | 2011-11-12 | 1 | -0/+86 |
| | * | test "commit -S" and "log --show-signature" | Junio C Hamano | 2011-11-12 | 1 | -0/+71 |
| | * | log: --show-signature | Junio C Hamano | 2011-11-12 | 5 | -0/+88 |
| | * | commit: teach --gpg-sign option | Junio C Hamano | 2011-11-12 | 7 | -13/+95 |
* | | | Merge branch 'jm/stash-diff-disambiguate' | Junio C Hamano | 2012-01-06 | 4 | -31/+80 |
|\ \ \ | |||||
| * | | | stash: Don't fail if work dir contains file named 'HEAD'jm/stash-diff-disambiguate | Jonathon Mah | 2012-01-01 | 4 | -31/+80 |
* | | | | Merge branch 'jh/fetch-head-update' | Junio C Hamano | 2012-01-06 | 25 | -102/+114 |
|\ \ \ \ | |||||
| * | | | | write first for-merge ref to FETCH_HEAD firstjh/fetch-head-update | Joey Hess | 2012-01-03 | 25 | -102/+114 |
* | | | | | Merge branch 'pw/p4-view-updates' | Junio C Hamano | 2012-01-06 | 3 | -82/+564 |
|\ \ \ \ \ | |||||
| * | | | | | git-p4: view spec documentation | Pete Wyckoff | 2012-01-03 | 1 | -13/+27 |
| * | | | | | git-p4: rewrite view handling | Pete Wyckoff | 2012-01-03 | 2 | -101/+258 |
| * | | | | | git-p4: support single file p4 client view maps | Gary Gibbons | 2012-01-03 | 2 | -10/+21 |
| * | | | | | git-p4: sort client views by reverse View number | Gary Gibbons | 2012-01-03 | 2 | -3/+10 |
| * | | | | | git-p4: fix test for unsupported P4 Client Views | Gary Gibbons | 2012-01-03 | 2 | -3/+6 |
| * | | | | | git-p4: test client view handling | Pete Wyckoff | 2012-01-03 | 1 | -0/+290 |
* | | | | | | Sync with 1.7.8.3 | Junio C Hamano | 2012-01-06 | 3 | -5/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Git 1.7.8.3v1.7.8.3 | Junio C Hamano | 2012-01-06 | 4 | -3/+22 |
| * | | | | | | Merge branch 'jn/maint-gitweb-utf8-fix' into maint | Junio C Hamano | 2012-01-06 | 1 | -4/+8 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2012-01-06 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-06 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Documentation: rerere.enabled is the primary way to configure rerere | Thomas Rast | 2012-01-06 | 1 | -4/+4 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-01-04 | 2 | -4/+7 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | t5550: repack everything into one file | Clemens Buchacher | 2012-01-04 | 1 | -2/+1 |
| * | | | | | | | | Merge branch 'nd/maint-parse-depth' into maint | Junio C Hamano | 2012-01-04 | 1 | -2/+6 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Catch invalid --depth option passed to clone or fetchnd/maint-parse-depth | Nguyễn Thái Ngọc Duy | 2012-01-04 | 1 | -2/+6 |
* | | | | | | | | | | Merge branch 'pw/p4-docs-and-tests' | Junio C Hamano | 2012-01-03 | 10 | -343/+830 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-p4: document and test submit optionspw/p4-docs-and-tests | Pete Wyckoff | 2011-12-27 | 3 | -2/+67 |
| * | | | | | | | | | | git-p4: test and document --use-client-spec | Pete Wyckoff | 2011-12-27 | 3 | -2/+55 |
| * | | | | | | | | | | git-p4: test --keep-path | Pete Wyckoff | 2011-12-27 | 1 | -0/+24 |
| * | | | | | | | | | | git-p4: test --max-changes | Pete Wyckoff | 2011-12-27 | 1 | -0/+10 |
| * | | | | | | | | | | git-p4: document and test --import-local | Pete Wyckoff | 2011-12-27 | 2 | -1/+25 |
| * | | | | | | | | | | git-p4: honor --changesfile option and test | Pete Wyckoff | 2011-12-27 | 2 | -1/+38 |
| * | | | | | | | | | | git-p4: document and test clone --branch | Pete Wyckoff | 2011-12-27 | 2 | -1/+20 |
| * | | | | | | | | | | git-p4: test cloning with two dirs, clarify doc | Pete Wyckoff | 2011-12-27 | 2 | -2/+69 |
| * | | | | | | | | | | git-p4: clone does not use --git-dir | Pete Wyckoff | 2011-12-27 | 2 | -1/+36 |
| * | | | | | | | | | | git-p4: introduce asciidoc documentation | Pete Wyckoff | 2011-12-27 | 2 | -302/+455 |
| * | | | | | | | | | | rename git-p4 tests | Pete Wyckoff | 2011-12-27 | 5 | -0/+0 |
* | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-01-03 | 5 | -8/+19 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | / / / | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2012-01-03 | 3 | -6/+11 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | |