Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/difftool-dir-diff-edit-fix' | Junio C Hamano | 2013-03-28 |
|\ | |||
| * | difftool --dir-diff: symlink all files matching the working tree | John Keeping | 2013-03-14 |
| * | difftool: avoid double slashes in symlink targets | John Keeping | 2013-03-14 |
| * | git-difftool(1): fix formatting of --symlink description | John Keeping | 2013-03-14 |
* | | Merge branch 'maint' | Junio C Hamano | 2013-03-28 |
|\ \ | |||
| * \ | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-03-28 |
| |\ \ | |||
| | * | | git help config: s/insn/instruction/ | Matthias Krüger | 2013-03-28 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2013-03-27 |
|\ \ \ \ | |/ / / | |||
| * | | | More fixes for 1.8.2.1 | Junio C Hamano | 2013-03-27 |
| * | | | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-03-27 |
| |\ \ \ | | |/ / | |||
| | * | | merge-tree: fix typo in merge-tree.c::unresolved | John Keeping | 2013-03-27 |
| | * | | git-commit doc: describe use of multiple `-m` options | Christian Helmuth | 2013-03-27 |
| | * | | git-pull doc: fix grammo ("conflicts" is plural) | Mihai Capotă | 2013-03-27 |
* | | | | Merge branch 'master' of git://git.bogomips.org/git-svn | Junio C Hamano | 2013-03-27 |
|\ \ \ \ | |||
| * | | | | git-svn: Support custom tunnel schemes instead of SSH only | Sebastian Schuberth | 2013-03-27 |
* | | | | | Merge branch 'rs/archive-zip-raw-compression' | Junio C Hamano | 2013-03-27 |
|\ \ \ \ \ | |||
| * | | | | | archive-zip: use deflateInit2() to ask for raw compressed data | René Scharfe | 2013-03-16 |
* | | | | | | Merge branch 'ap/combine-diff-ignore-whitespace' | Junio C Hamano | 2013-03-27 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||
| * | | | | | Allow combined diff to ignore white-spaces | Antoine Pelisse | 2013-03-14 |
* | | | | | | More topics from the second batch for 1.8.3 | Junio C Hamano | 2013-03-26 |
* | | | | | | Merge branch 'jc/reflog-reverse-walk' | Junio C Hamano | 2013-03-26 |
|\ \ \ \ \ \ | |||
| * | | | | | | refs.c: fix fread error handling | John Keeping | 2013-03-23 |
| * | | | | | | reflog: add for_each_reflog_ent_reverse() API | Junio C Hamano | 2013-03-08 |
| * | | | | | | for_each_recent_reflog_ent(): simplify opening of a reflog file | Junio C Hamano | 2013-03-08 |
| * | | | | | | for_each_reflog_ent(): extract a helper to process a single entry | Junio C Hamano | 2013-03-08 |
* | | | | | | | Merge branch 'kb/p4merge' | Junio C Hamano | 2013-03-26 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | merge-one-file: force content conflict for "both sides added" case | Junio C Hamano | 2013-03-25 |
| * | | | | | | | git-merge-one-file: send "ERROR:" messages to stderr | Kevin Bracey | 2013-03-25 |
| * | | | | | | | git-merge-one-file: style cleanup | Kevin Bracey | 2013-03-25 |
| * | | | | | | | merge-one-file: remove stale comment | Junio C Hamano | 2013-03-25 |
| * | | | | | | | mergetools/p4merge: create a base if none available | Kevin Bracey | 2013-03-13 |
| * | | | | | | | mergetools/p4merge: swap LOCAL and REMOTE | Kevin Bracey | 2013-03-13 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-03-26 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||
| * | | | | | | | More corrections for 1.8.2.1 | Junio C Hamano | 2013-03-26 |
| * | | | | | | | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-03-26 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||
| | * | | | | | | Correct the docs about GIT_SSH. | Dan Bornstein | 2013-03-26 |
| * | | | | | | | Merge branch 'we/submodule-update-prefix-output' into maint | Junio C Hamano | 2013-03-26 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'jk/mailsplit-maildir-muttsort' into maint | Junio C Hamano | 2013-03-26 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'rs/zip-compresssed-size-with-export-subst' into maint | Junio C Hamano | 2013-03-26 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||
| * | | | | | | | | | Merge branch 'jk/utf-8-can-be-spelled-differently' into maint | Junio C Hamano | 2013-03-26 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'nd/branch-error-cases' into maint | Junio C Hamano | 2013-03-26 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ap/maint-update-index-h-is-for-help' into maint | Junio C Hamano | 2013-03-26 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/perl-cat-blob' into maint | Junio C Hamano | 2013-03-26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ob/imap-send-ssl-verify' into maint | Junio C Hamano | 2013-03-26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/index-pack-l10n-buf-overflow' into maint | Junio C Hamano | 2013-03-26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-push-refspec-default-doc' into maint | Junio C Hamano | 2013-03-26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'wk/user-manual-literal-format' into maint | Junio C Hamano | 2013-03-26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maint | Junio C Hamano | 2013-03-26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' into maint | Junio C Hamano | 2013-03-26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | | | | | | | | | | | Second wave of topics toward 1.8.3 | Junio C Hamano | 2013-03-25 |