summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* dashed externals: kill children on exitcb/maint-kill-subprocess-upon-signalClemens Buchacher2012-01-083-1/+3
* run-command: optionally kill children on exitJeff King2012-01-082-0/+69
* Git 1.7.9-rc0v1.7.9-rc0Junio C Hamano2012-01-062-1/+8
* Merge branch 'jc/show-sig'Junio C Hamano2012-01-0616-34/+488
|\
| * log --show-signature: reword the common two-head merge casejc/show-sigJunio C Hamano2012-01-051-0/+12
| * log-tree: show mergetag in log --show-signature outputJunio C Hamano2012-01-051-1/+75
| * log-tree.c: small refactor in show_signature()Junio C Hamano2012-01-051-12/+16
| * commit --amend -S: strip existing gpgsig headersJunio C Hamano2012-01-054-8/+36
| * verify_signed_buffer: fix stale commentJunio C Hamano2012-01-051-4/+1
| * Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'Junio C Hamano2012-01-0515-19/+364
| |\
| | * gpg-interface: allow use of a custom GPG binaryjc/signed-commitJunio C Hamano2011-11-293-6/+24
| | * pretty: %G[?GS] placeholdersJunio C Hamano2011-11-121-0/+86
| | * test "commit -S" and "log --show-signature"Junio C Hamano2011-11-121-0/+71
| | * log: --show-signatureJunio C Hamano2011-11-125-0/+88
| | * commit: teach --gpg-sign optionJunio C Hamano2011-11-127-13/+95
* | | Merge branch 'jm/stash-diff-disambiguate'Junio C Hamano2012-01-064-31/+80
|\ \ \
| * | | stash: Don't fail if work dir contains file named 'HEAD'jm/stash-diff-disambiguateJonathon Mah2012-01-014-31/+80
* | | | Merge branch 'jh/fetch-head-update'Junio C Hamano2012-01-0625-102/+114
|\ \ \ \
| * | | | write first for-merge ref to FETCH_HEAD firstjh/fetch-head-updateJoey Hess2012-01-0325-102/+114
* | | | | Merge branch 'pw/p4-view-updates'Junio C Hamano2012-01-063-82/+564
|\ \ \ \ \
| * | | | | git-p4: view spec documentationPete Wyckoff2012-01-031-13/+27
| * | | | | git-p4: rewrite view handlingPete Wyckoff2012-01-032-101/+258
| * | | | | git-p4: support single file p4 client view mapsGary Gibbons2012-01-032-10/+21
| * | | | | git-p4: sort client views by reverse View numberGary Gibbons2012-01-032-3/+10
| * | | | | git-p4: fix test for unsupported P4 Client ViewsGary Gibbons2012-01-032-3/+6
| * | | | | git-p4: test client view handlingPete Wyckoff2012-01-031-0/+290
* | | | | | Sync with 1.7.8.3Junio C Hamano2012-01-063-5/+24
|\ \ \ \ \ \
| * | | | | | Git 1.7.8.3v1.7.8.3Junio C Hamano2012-01-064-3/+22
| * | | | | | Merge branch 'jn/maint-gitweb-utf8-fix' into maintJunio C Hamano2012-01-061-4/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-061-4/+4
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-061-4/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | Documentation: rerere.enabled is the primary way to configure rerereThomas Rast2012-01-061-4/+4
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-01-042-4/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | t5550: repack everything into one fileClemens Buchacher2012-01-041-2/+1
| * | | | | | | | Merge branch 'nd/maint-parse-depth' into maintJunio C Hamano2012-01-041-2/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Catch invalid --depth option passed to clone or fetchnd/maint-parse-depthNguyễn Thái Ngọc Duy2012-01-041-2/+6
* | | | | | | | | | Merge branch 'pw/p4-docs-and-tests'Junio C Hamano2012-01-0310-343/+830
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-p4: document and test submit optionspw/p4-docs-and-testsPete Wyckoff2011-12-273-2/+67
| * | | | | | | | | | git-p4: test and document --use-client-specPete Wyckoff2011-12-273-2/+55
| * | | | | | | | | | git-p4: test --keep-pathPete Wyckoff2011-12-271-0/+24
| * | | | | | | | | | git-p4: test --max-changesPete Wyckoff2011-12-271-0/+10
| * | | | | | | | | | git-p4: document and test --import-localPete Wyckoff2011-12-272-1/+25
| * | | | | | | | | | git-p4: honor --changesfile option and testPete Wyckoff2011-12-272-1/+38
| * | | | | | | | | | git-p4: document and test clone --branchPete Wyckoff2011-12-272-1/+20
| * | | | | | | | | | git-p4: test cloning with two dirs, clarify docPete Wyckoff2011-12-272-2/+69
| * | | | | | | | | | git-p4: clone does not use --git-dirPete Wyckoff2011-12-272-1/+36
| * | | | | | | | | | git-p4: introduce asciidoc documentationPete Wyckoff2011-12-272-302/+455
| * | | | | | | | | | rename git-p4 testsPete Wyckoff2011-12-275-0/+0
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-01-035-8/+19
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | / / / | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-033-6/+11
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |