| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'rr/cherry-pick-fast-forward-reflog-message' | Junio C Hamano | 2013-06-27 | 1 | -3/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | sequencer: write useful reflog message for fast-forward | Ramkumar Ramachandra | 2013-06-19 | 1 | -3/+8 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mt/send-email-cc-match-fix' | Junio C Hamano | 2013-06-27 | 2 | -2/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | send-email: sanitize author when writing From line | Michael S. Tsirkin | 2013-06-20 | 2 | -3/+4 |
| * | | | | | | | | | | | | | | | | | | | | send-email: add test for duplicate utf8 name | Michael S. Tsirkin | 2013-06-20 | 1 | -0/+14 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pull-into-dirty-unborn' | Junio C Hamano | 2013-06-27 | 2 | -2/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | pull: merge into unborn by fast-forwarding from empty tree | Thomas Rast | 2013-06-20 | 2 | -1/+37 |
| * | | | | | | | | | | | | | | | | | | | | | pull: update unborn branch tip after index | Jeff King | 2013-06-20 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/http-keep-memory-given-to-curl' | Junio C Hamano | 2013-06-27 | 1 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | http.c: don't rewrite the user:passwd string multiple times | Brandon Casey | 2013-06-19 | 1 | -3/+9 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/checkout-tracking-name-plug-leak' | Junio C Hamano | 2013-06-27 | 2 | -4/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | t/t9802: explicitly name the upstream branch to use as a base | Brandon Casey | 2013-06-18 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | builtin/checkout.c: don't leak memory in check_tracking_name | Brandon Casey | 2013-06-18 | 1 | -2/+5 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/rebase-stash-store' | Junio C Hamano | 2013-06-27 | 4 | -17/+74 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | rebase: use 'git stash store' to simplify logic | Ramkumar Ramachandra | 2013-06-17 | 1 | -5/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | | stash: introduce 'git stash store' | Ramkumar Ramachandra | 2013-06-17 | 3 | -6/+67 |
| * | | | | | | | | | | | | | | | | | | | | | | | | stash: simplify option parser for create | Ramkumar Ramachandra | 2013-06-17 | 1 | -4/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | stash doc: document short form -p in synopsis | Ramkumar Ramachandra | 2013-06-17 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | stash doc: add a warning about using create | Ramkumar Ramachandra | 2013-06-17 | 1 | -1/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-06-26 | 1 | -0/+12 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-apply-non-git-patch-parsefix' | Junio C Hamano | 2013-06-26 | 2 | -1/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | apply: carefully strdup a possibly-NULL name | Thomas Rast | 2013-06-21 | 2 | -1/+15 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ys/cygstart' | Junio C Hamano | 2013-06-26 | 2 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | web--browse: support /usr/bin/cygstart on Cygwin | Yaakov Selkowitz | 2013-06-21 | 2 | -3/+9 |
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'wk/doc-git-has-grown' | Junio C Hamano | 2013-06-26 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | user-manual: Update download size for Git and the kernel | W. Trevor King | 2013-06-23 | 1 | -3/+3 |
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'vl/typofix' | Junio C Hamano | 2013-06-26 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | random typofixes (committed missing a 't', successful missing an 's') | Veres Lajos | 2013-06-19 | 3 | -3/+3 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' | Junio C Hamano | 2013-06-26 | 9 | -21/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | fix "builtin-*" references to be "builtin/*" | Phil Hord | 2013-06-18 | 9 | -21/+20 |
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/merge-in-dirty-worktree-doc' | Junio C Hamano | 2013-06-26 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-merge.txt: weaken warning about uncommited changes | Matthieu Moy | 2013-06-18 | 1 | -2/+2 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kb/diff-blob-blob-doc' | Junio C Hamano | 2013-06-26 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: Move "git diff <blob> <blob>" | Kevin Bracey | 2013-06-18 | 1 | -7/+7 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/push-force-is-dangerous' | Junio C Hamano | 2013-06-26 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-push.txt: explain better cases where --force is dangerous | Matthieu Moy | 2013-06-18 | 1 | -0/+9 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fg/submodule-non-ascii-path' | Junio C Hamano | 2013-06-26 | 2 | -1/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t7400: test of UTF-8 submodule names pass under Mac OS | Torsten Bögershausen | 2013-06-20 | 1 | -8/+11 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | handle multibyte characters in name | Fredrik Gustafsson | 2013-06-14 | 2 | -1/+14 |
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-06-24 | 1 | -4/+14 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/am-quit-empty-then-abort-fix' | Junio C Hamano | 2013-06-24 | 2 | -17/+40 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t/am: use test_path_is_missing() where appropriate | Ramkumar Ramachandra | 2013-06-17 | 1 | -17/+17 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am: handle stray $dotest directory | Ramkumar Ramachandra | 2013-06-17 | 2 | -0/+23 |
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rt/cherry-pick-continue-advice-in-status' | Junio C Hamano | 2013-06-24 | 2 | -4/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | wt-status: give better advice when cherry-pick is in progress | Ralf Thielow | 2013-06-17 | 2 | -4/+8 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nk/config-local-doc' | Junio C Hamano | 2013-06-24 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | config: Add description of --local option | Namhyung Kim | 2013-06-17 | 1 | -0/+9 |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/mergetool-lib-refactor' | Junio C Hamano | 2013-06-24 | 1 | -47/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | mergetool--lib: refactor {diff,merge}_cmd logic | John Keeping | 2013-06-17 | 1 | -47/+35 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/doc-build-move-infordir-def' | Junio C Hamano | 2013-06-24 | 1 | -22/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|