Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jl/submodule-deinit' | Junio C Hamano | 2013-04-05 | 2 | -7/+20 |
|\ | |||||
| * | submodule deinit: clarify work tree removal message | Jens Lehmann | 2013-04-01 | 2 | -7/+20 |
* | | Merge branch 'rr/send-email-perl-critique' | Junio C Hamano | 2013-04-05 | 1 | -8/+10 |
|\ \ | |||||
| * | | send-email: use the three-arg form of open in recipients_cmd | Ramkumar Ramachandra | 2013-03-31 | 1 | -1/+1 |
| * | | send-email: drop misleading function prototype | Ramkumar Ramachandra | 2013-03-31 | 1 | -4/+6 |
| * | | send-email: use "return;" not "return undef;" on error codepaths | Ramkumar Ramachandra | 2013-03-31 | 1 | -3/+3 |
* | | | Merge branch 'jc/merge-tag-object' | Junio C Hamano | 2013-04-05 | 2 | -32/+81 |
|\ \ \ | |||||
| * | | | t6200: test message for merging of an annotated tag | Junio C Hamano | 2013-04-01 | 1 | -0/+39 |
| * | | | t6200: use test_config/test_unconfig | Junio C Hamano | 2013-04-01 | 1 | -32/+29 |
| * | | | merge: a random object may not necssarily be a commit | Junio C Hamano | 2013-03-19 | 1 | -0/+13 |
* | | | | Sync with maint | Junio C Hamano | 2013-04-04 | 2 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | mailmap: update Pasky's address | Junio C Hamano | 2013-04-04 | 1 | -0/+1 |
| * | | | | Merge branch 'nd/index-pack-threaded-fixes' into maint | Junio C Hamano | 2013-04-04 | 1 | -8/+26 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/index-pack-correct-depth-fix' into maint | Junio C Hamano | 2013-04-04 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'rs/submodule-summary-limit' into maint | Junio C Hamano | 2013-04-04 | 1 | -6/+11 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/peel-ref' into maint | Junio C Hamano | 2013-04-04 | 2 | -4/+11 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-remote-mediawiki: new wiki URL in documentation | Matthieu Moy | 2013-04-04 | 1 | -1/+1 |
* | | | | | | | | | Update draft release notes to 1.8.3 | Junio C Hamano | 2013-04-03 | 1 | -10/+31 |
* | | | | | | | | | Sync with maint | Junio C Hamano | 2013-04-03 | 3 | -0/+75 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Update draft release notes to 1.8.2.1 | Junio C Hamano | 2013-04-03 | 1 | -0/+35 |
| * | | | | | | | | Merge branch 'mg/gpg-interface-using-status' into maint | Junio C Hamano | 2013-04-03 | 7 | -25/+46 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'bc/commit-complete-lines-given-via-m-option' into maint | Junio C Hamano | 2013-04-03 | 3 | -15/+34 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/describe' into maint | Junio C Hamano | 2013-04-03 | 1 | -21/+20 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/alias-in-bare' into maint | Junio C Hamano | 2013-04-03 | 5 | -12/+53 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ks/rfc2047-one-char-at-a-time' into maint | Junio C Hamano | 2013-04-03 | 4 | -25/+77 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/empty-archive' into maint | Junio C Hamano | 2013-04-03 | 6 | -13/+109 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ph/tag-force-no-warn-on-creation' into maint | Junio C Hamano | 2013-04-03 | 2 | -1/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'lf/setup-prefix-pathspec' into maint | Junio C Hamano | 2013-04-03 | 1 | -5/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Sync with 1.8.1 maintenance track | Junio C Hamano | 2013-04-03 | 19 | -164/+462 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | Start preparing for 1.8.1.6 | Junio C Hamano | 2013-04-03 | 2 | -1/+35 |
| | * | | | | | | | | | | | | | | | | Merge branch 'kb/name-hash' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 4 | -62/+166 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 2 | -1/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/checkout-attribute-lookup' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 2 | -74/+97 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 9 | -27/+145 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 2 | -1/+67 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'yd/doc-merge-annotated-tag' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 2 | -1/+26 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/perl-cat-blob' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -10/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -0/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -4/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | git-tag(1): we tag HEAD by default | Thomas Rast | 2013-04-03 | 1 | -0/+6 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/sha1-name-object-peeler' | Junio C Hamano | 2013-04-03 | 2 | -1/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | peel_onion(): teach $foo^{object} peeler | Junio C Hamano | 2013-03-31 | 2 | -1/+8 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | peel_onion: disambiguate to favor tree-ish when we know we want a tree-ish | Junio C Hamano | 2013-03-31 | 1 | -0/+2 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' | Junio C Hamano | 2013-04-03 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5516: test interaction between pushURL and pushInsteadOf correctly | Junio C Hamano | 2013-03-28 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/submodule-summary-limit' | Junio C Hamano | 2013-04-03 | 1 | -6/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule summary: support --summary-limit=<n> | René Scharfe | 2013-04-01 | 1 | -6/+11 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/valgrind' | Junio C Hamano | 2013-04-03 | 4 | -17/+44 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: notice valgrind error in test_must_fail | Thomas Rast | 2013-04-01 | 1 | -0/+3 |