Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | | | | | | | | | | | | | | | use parse_object_or_die instead of die("bad object") | Jeff King | 2013-03-17 | 3 | -9/+3 |
| * | | | | | | | | | | | | | | | | | avoid segfaults on parse_object failure | Jeff King | 2013-03-17 | 4 | -5/+26 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/fast-export-object-lookup' | Junio C Hamano | 2013-03-25 | 1 | -9/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | fast-export: do not load blob objects twice | Jeff King | 2013-03-17 | 1 | -6/+10 |
| * | | | | | | | | | | | | | | | | | | fast-export: rename handle_object function | Jeff King | 2013-03-17 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/peel-ref' | Junio C Hamano | 2013-03-25 | 2 | -4/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | upload-pack: load non-tip "want" objects from disk | Jeff King | 2013-03-16 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | upload-pack: make sure "want" objects are parsed | Jeff King | 2013-03-16 | 2 | -1/+10 |
| * | | | | | | | | | | | | | | | | | | | upload-pack: drop lookup-before-parse optimization | Jeff King | 2013-03-16 | 1 | -3/+1 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'lf/setup-prefix-pathspec' | Junio C Hamano | 2013-03-25 | 1 | -5/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | setup.c: check that the pathspec magic ends with ")" | Andrew Wong | 2013-03-14 | 1 | -2/+3 |
| * | | | | | | | | | | | | | | | | | | | | setup.c: stop prefix_pathspec() from looping past the end of string | Andrew Wong | 2013-03-14 | 1 | -3/+4 |
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ph/tag-force-no-warn-on-creation' | Junio C Hamano | 2013-03-25 | 2 | -1/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | tag: --force does not have to warn when creating tags | Phil Hord | 2013-03-13 | 2 | -1/+13 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/unsigned-time-t' | Junio C Hamano | 2013-03-25 | 1 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | Fix time offset calculation in case of unsigned time_t | Mike Gorchak | 2013-02-25 | 1 | -2/+8 |
| * | | | | | | | | | | | | | | | | | | | | | date.c: fix unsigned time_t comparison | Mike Gorchak | 2013-02-25 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/suppress-clang-warning' | Junio C Hamano | 2013-03-25 | 2 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | fix clang -Wtautological-compare with unsigned enum | Antoine Pelisse | 2013-02-25 | 2 | -2/+4 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/p4-symlinked-root' | Junio C Hamano | 2013-03-25 | 2 | -7/+63 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | git p4: avoid expanding client paths in chdir | Miklós Fazekas | 2013-03-11 | 2 | -8/+23 |
| * | | | | | | | | | | | | | | | | | | | | | | | git p4 test: should honor symlink in p4 client root | Pete Wyckoff | 2013-03-11 | 1 | -0/+27 |