summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* submodule update: allow custom command to update submodule working treecp/submodule-custom-updateChris Packham2013-07-033-1/+38
* Merge branch 'jk/submodule-subdirectory-ok'Junio C Hamano2013-06-309-213/+673
|\
| * submodule: drop the top-level requirementJohn Keeping2013-06-176-35/+319
| * rev-parse: add --prefix optionJohn Keeping2013-06-173-5/+131
| * submodule: show full path in error messageJohn Keeping2013-06-171-1/+1
| * t7403: add missing && chainingJohn Keeping2013-06-171-2/+2
| * t7403: modernize styleJohn Keeping2013-06-171-133/+183
| * t7401: make indentation consistentJohn Keeping2013-06-171-40/+40
* | Sync with 1.8.3.2Junio C Hamano2013-06-283-2/+8
|\ \
| * | Git 1.8.3.2v1.8.3.2Junio C Hamano2013-06-283-2/+8
| * | configure: fix option help message for --disable-pthreadsStefano Lattarini2013-06-281-1/+1
| * | Merge branch 'nd/clone-connectivity-shortcut' (early part) into maintJunio C Hamano2013-06-286-38/+97
| |\ \
* | \ \ Merge branch 'maint'Junio C Hamano2013-06-271-0/+54
|\ \ \ \ | |/ / /
| * | | Start preparing for 1.8.3.2Junio C Hamano2013-06-272-1/+55
| * | | Merge branch 'ks/difftool-dir-diff-copy-fix' into maintJunio C Hamano2013-06-272-7/+21
| |\ \ \
| * \ \ \ Merge branch 'rr/push-head' into maintJunio C Hamano2013-06-271-7/+14
| |\ \ \ \
| * \ \ \ \ Merge branch 'fc/show-branch-in-rebase-am' into maintJunio C Hamano2013-06-272-1/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'tg/maint-zsh-svn-remote-prompt' into maintJunio C Hamano2013-06-271-3/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into maintJunio C Hamano2013-06-271-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tr/push-no-verify-doc' into maintJunio C Hamano2013-06-271-1/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rs/commit-m-no-edit' into maintJunio C Hamano2013-06-272-4/+23
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/strbuf-branchname-fix' into maintJunio C Hamano2013-06-272-4/+19
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ 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