Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge/pull Check for untrusted good GPG signatures | Sebastian Götte | 2013-03-31 | 10 | -12/+29 |
* | merge/pull: verify GPG signatures of commits being merged | Sebastian Götte | 2013-03-31 | 4 | -3/+98 |
* | commit.c/GPG signature verification: Also look at the first GPG status line | Sebastian Götte | 2013-03-31 | 1 | -5/+12 |
* | Move commit GPG signature verification to commit.c | Sebastian Götte | 2013-03-31 | 4 | -78/+93 |
* | Merge branch 'maint' | Junio C Hamano | 2013-03-27 | 4 | -2/+7 |
|\ | |||||
| * | More fixes for 1.8.2.1 | Junio C Hamano | 2013-03-27 | 1 | -0/+3 |
| * | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-03-27 | 3 | -2/+4 |
| |\ | |||||
| | * | merge-tree: fix typo in merge-tree.c::unresolved | John Keeping | 2013-03-27 | 1 | -1/+1 |
| | * | git-commit doc: describe use of multiple `-m` options | Christian Helmuth | 2013-03-27 | 1 | -0/+2 |
| | * | git-pull doc: fix grammo ("conflicts" is plural) | Mihai Capotă | 2013-03-27 | 1 | -1/+1 |
* | | | Merge branch 'master' of git://git.bogomips.org/git-svn | Junio C Hamano | 2013-03-27 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | git-svn: Support custom tunnel schemes instead of SSH only | Sebastian Schuberth | 2013-03-27 | 1 | -1/+1 |
* | | | | Merge branch 'rs/archive-zip-raw-compression' | Junio C Hamano | 2013-03-27 | 3 | -28/+34 |
|\ \ \ \ | |||||
| * | | | | archive-zip: use deflateInit2() to ask for raw compressed data | René Scharfe | 2013-03-16 | 3 | -28/+34 |
* | | | | | Merge branch 'ap/combine-diff-ignore-whitespace' | Junio C Hamano | 2013-03-27 | 2 | -7/+161 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Allow combined diff to ignore white-spaces | Antoine Pelisse | 2013-03-14 | 2 | -7/+161 |
* | | | | | More topics from the second batch for 1.8.3 | Junio C Hamano | 2013-03-26 | 1 | -14/+8 |
* | | | | | Merge branch 'jc/reflog-reverse-walk' | Junio C Hamano | 2013-03-26 | 3 | -77/+134 |
|\ \ \ \ \ | |||||
| * | | | | | refs.c: fix fread error handling | John Keeping | 2013-03-23 | 1 | -1/+1 |
| * | | | | | reflog: add for_each_reflog_ent_reverse() API | Junio C Hamano | 2013-03-08 | 3 | -47/+105 |
| * | | | | | for_each_recent_reflog_ent(): simplify opening of a reflog file | Junio C Hamano | 2013-03-08 | 1 | -3/+1 |
| * | | | | | for_each_reflog_ent(): extract a helper to process a single entry | Junio C Hamano | 2013-03-08 | 1 | -29/+30 |
* | | | | | | Merge branch 'kb/p4merge' | Junio C Hamano | 2013-03-26 | 4 | -35/+52 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge-one-file: force content conflict for "both sides added" case | Junio C Hamano | 2013-03-25 | 1 | -5/+2 |
| * | | | | | | git-merge-one-file: send "ERROR:" messages to stderr | Kevin Bracey | 2013-03-25 | 1 | -7/+7 |
| * | | | | | | git-merge-one-file: style cleanup | Kevin Bracey | 2013-03-25 | 1 | -9/+17 |
| * | | | | | | merge-one-file: remove stale comment | Junio C Hamano | 2013-03-25 | 1 | -2/+0 |
| * | | | | | | mergetools/p4merge: create a base if none available | Kevin Bracey | 2013-03-13 | 4 | -14/+28 |
| * | | | | | | mergetools/p4merge: swap LOCAL and REMOTE | Kevin Bracey | 2013-03-13 | 1 | -1/+1 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-03-26 | 2 | -3/+45 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | More corrections for 1.8.2.1 | Junio C Hamano | 2013-03-26 | 1 | -0/+39 |
| * | | | | | | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-03-26 | 1 | -3/+6 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Correct the docs about GIT_SSH. | Dan Bornstein | 2013-03-26 | 1 | -3/+6 |
| * | | | | | | Merge branch 'we/submodule-update-prefix-output' into maint | Junio C Hamano | 2013-03-26 | 2 | -14/+20 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/mailsplit-maildir-muttsort' into maint | Junio C Hamano | 2013-03-26 | 1 | -0/+23 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'rs/zip-compresssed-size-with-export-subst' into maint | Junio C Hamano | 2013-03-26 | 2 | -1/+7 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'jk/utf-8-can-be-spelled-differently' into maint | Junio C Hamano | 2013-03-26 | 1 | -2/+18 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'nd/branch-error-cases' into maint | Junio C Hamano | 2013-03-26 | 2 | -0/+48 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ap/maint-update-index-h-is-for-help' into maint | Junio C Hamano | 2013-03-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/perl-cat-blob' into maint | Junio C Hamano | 2013-03-26 | 1 | -10/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ob/imap-send-ssl-verify' into maint | Junio C Hamano | 2013-03-26 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/index-pack-l10n-buf-overflow' into maint | Junio C Hamano | 2013-03-26 | 1 | -4/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-push-refspec-default-doc' into maint | Junio C Hamano | 2013-03-26 | 1 | -9/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'wk/user-manual-literal-format' into maint | Junio C Hamano | 2013-03-26 | 1 | -142/+144 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maint | Junio C Hamano | 2013-03-26 | 3 | -7/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' into maint | Junio C Hamano | 2013-03-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | Second wave of topics toward 1.8.3 | Junio C Hamano | 2013-03-25 | 1 | -7/+58 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fully-peeled-packed-ref' | Junio C Hamano | 2013-03-25 | 9 | -27/+145 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | pack-refs: add fully-peeled trait | Michael Haggerty | 2013-03-18 | 3 | -6/+67 |
| * | | | | | | | | | | | | | | | | | | | pack-refs: write peeled entry for non-tags | Jeff King | 2013-03-17 | 2 | -8/+50 |