summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | Merge branch 'mk/combine-diff-context-horizon-fix' into maintJunio C Hamano2013-06-272-2/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kb/ancestry-path-threedots' into maintJunio C Hamano2013-06-273-1/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/subtree-do-not-push-if-split-fails' into maintJunio C Hamano2013-06-271-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/fetch-into-shallow' into maintJunio C Hamano2013-06-273-3/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-06-278-35/+221
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-271-1/+10
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/add-i-custom-diff-algo'Junio C Hamano2013-06-271-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | add -i: add extra options at the right place in "diff" command lineJunio C Hamano2013-06-231-1/+1
| * | | | | | | | | | | | | | | | | | | | | add--interactive: respect diff.algorithmJohn Keeping2013-06-121-0/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/cherry-pick-fast-forward-reflog-message'Junio C Hamano2013-06-271-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | sequencer: write useful reflog message for fast-forwardRamkumar Ramachandra2013-06-191-3/+8
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'mt/send-email-cc-match-fix'Junio C Hamano2013-06-272-2/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | send-email: sanitize author when writing From lineMichael S. Tsirkin2013-06-202-3/+4
| * | | | | | | | | | | | | | | | | | | | | | send-email: add test for duplicate utf8 nameMichael S. Tsirkin2013-06-201-0/+14
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pull-into-dirty-unborn'Junio C Hamano2013-06-272-2/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | pull: merge into unborn by fast-forwarding from empty treeThomas Rast2013-06-202-1/+37
| * | | | | | | | | | | | | | | | | | | | | | | pull: update unborn branch tip after indexJeff King2013-06-201-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/http-keep-memory-given-to-curl'Junio C Hamano2013-06-271-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | http.c: don't rewrite the user:passwd string multiple timesBrandon Casey2013-06-191-3/+9
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/checkout-tracking-name-plug-leak'Junio C Hamano2013-06-272-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | t/t9802: explicitly name the upstream branch to use as a baseBrandon Casey2013-06-181-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/checkout.c: don't leak memory in check_tracking_nameBrandon Casey2013-06-181-2/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/rebase-stash-store'Junio C Hamano2013-06-274-17/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | rebase: use 'git stash store' to simplify logicRamkumar Ramachandra2013-06-171-5/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | stash: introduce 'git stash store'Ramkumar Ramachandra2013-06-173-6/+67
| * | | | | | | | | | | | | | | | | | | | | | | | | | stash: simplify option parser for createRamkumar Ramachandra2013-06-171-4/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | stash doc: document short form -p in synopsisRamkumar Ramachandra2013-06-171-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | stash doc: add a warning about using createRamkumar Ramachandra2013-06-171-1/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-261-0/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-apply-non-git-patch-parsefix'Junio C Hamano2013-06-262-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | apply: carefully strdup a possibly-NULL nameThomas Rast2013-06-212-1/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ys/cygstart'Junio C Hamano2013-06-262-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | web--browse: support /usr/bin/cygstart on CygwinYaakov Selkowitz2013-06-212-3/+9
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'wk/doc-git-has-grown'Junio C Hamano2013-06-261-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | user-manual: Update download size for Git and the kernelW. Trevor King2013-06-231-3/+3
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'vl/typofix'Junio C Hamano2013-06-263-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | random typofixes (committed missing a 't', successful missing an 's')Veres Lajos2013-06-193-3/+3
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'Junio C Hamano2013-06-269-21/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | fix "builtin-*" references to be "builtin/*"Phil Hord2013-06-189-21/+20
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/merge-in-dirty-worktree-doc'Junio C Hamano2013-06-261-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-merge.txt: weaken warning about uncommited changesMatthieu Moy2013-06-181-2/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kb/diff-blob-blob-doc'Junio C Hamano2013-06-261-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: Move "git diff <blob> <blob>"Kevin Bracey2013-06-181-7/+7
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/push-force-is-dangerous'Junio C Hamano2013-06-261-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-push.txt: explain better cases where --force is dangerousMatthieu Moy2013-06-181-0/+9
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fg/submodule-non-ascii-path'Junio C Hamano2013-06-262-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t7400: test of UTF-8 submodule names pass under Mac OSTorsten Bögershausen2013-06-201-8/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | handle multibyte characters in nameFredrik Gustafsson2013-06-142-1/+14
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-241-4/+14
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/am-quit-empty-then-abort-fix'Junio C Hamano2013-06-242-17/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \