summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/skip-http-tests-under-no-curl'Junio C Hamano2015-05-228-35/+13
|\
| * tests: skip dav http-push tests under NO_EXPAT=NoThanksjk/skip-http-tests-under-no-curlJunio C Hamano2015-05-072-0/+7
| * t/lib-httpd.sh: skip tests if NO_CURL is definedJeff King2015-05-077-35/+6
* | Merge branch 'dl/subtree-push-no-squash'Junio C Hamano2015-05-222-2/+2
|\ \
| * | contrib/subtree: there's no push --squashdl/subtree-push-no-squashDanny Lin2015-05-072-2/+2
* | | Merge branch 'sg/completion-omit-credential-helpers'Junio C Hamano2015-05-221-2/+2
|\ \ \
| * | | completion: remove credential helpers from porcelain commandssg/completion-omit-credential-helpersSZEDER Gábor2015-05-061-2/+2
| | |/ | |/|
* | | Merge branch 'dl/branch-error-message'Junio C Hamano2015-05-221-3/+3
|\ \ \
| * | | branch: do not call a "remote-tracking branch" a "remote branch"dl/branch-error-messageDanny Lin2015-05-061-3/+3
* | | | Third batch for 2.5 cycleJunio C Hamano2015-05-191-0/+81
* | | | Merge branch 'sb/ref-lock-lose-lock-fd'Junio C Hamano2015-05-191-10/+5
|\ \ \ \
| * | | | refs.c: remove lock_fd from struct ref_locksb/ref-lock-lose-lock-fdStefan Beller2015-05-101-10/+5
* | | | | Merge branch 'kn/cat-file-literally'Junio C Hamano2015-05-195-43/+188
|\ \ \ \ \
| * | | | | t1006: add tests for git cat-file --allow-unknown-typekn/cat-file-literallyKarthik Nayak2015-05-061-0/+45
| * | | | | cat-file: teach cat-file a '--allow-unknown-type' optionKarthik Nayak2015-05-062-13/+30
| * | | | | cat-file: make the options mutually exclusiveKarthik Nayak2015-05-061-8/+5
| * | | | | sha1_file: support reading from a loose object of unknown typeKarthik Nayak2015-05-062-22/+108
* | | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano2015-05-191-1/+3
|\ \ \ \ \ \
| * | | | | | pathspec: avoid the need of "--" when wildcard is usedDuy Nguyen2015-05-031-1/+3
* | | | | | | Merge branch 'jc/merge'Junio C Hamano2015-05-1910-112/+324
|\ \ \ \ \ \ \
| * | | | | | | merge: deprecate 'git merge <message> HEAD <commit>' syntaxjc/mergeJunio C Hamano2015-04-297-9/+9
| * | | | | | | merge: handle FETCH_HEAD internallyJunio C Hamano2015-04-293-39/+81
| * | | | | | | merge: decide if we auto-generate the message early in collect_parents()Junio C Hamano2015-04-291-7/+9
| * | | | | | | merge: make collect_parents() auto-generate the merge messageJunio C Hamano2015-04-291-14/+22
| * | | | | | | merge: extract prepare_merge_message() logic outJunio C Hamano2015-04-291-11/+15
| * | | | | | | merge: narrow scope of merge_namesJunio C Hamano2015-04-291-4/+7
| * | | | | | | merge: split reduce_parents() out of collect_parents()Junio C Hamano2015-04-291-16/+25
| * | | | | | | merge: clarify collect_parents() logicJunio C Hamano2015-04-291-2/+11
| * | | | | | | merge: small leakfix and code simplificationJunio C Hamano2015-04-291-2/+2
| * | | | | | | merge: do not check argc to determine number of remote headsJunio C Hamano2015-04-291-3/+2
| * | | | | | | merge: clarify "pulling into void" special caseJunio C Hamano2015-04-291-17/+18
| * | | | | | | t5520: test pulling an octopus into an unborn branchJunio C Hamano2015-04-291-0/+9
| * | | | | | | t5520: style fixesJunio C Hamano2015-04-291-16/+6
| * | | | | | | merge: simplify code flowJunio C Hamano2015-04-291-8/+8
| * | | | | | | merge: test the top-level merge driverJunio C Hamano2015-04-291-0/+136
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'ph/rebase-i-redo'Junio C Hamano2015-05-192-0/+63
|\ \ \ \ \ \ \
| * | | | | | | rebase -i: redo tasks that die during cherry-pickph/rebase-i-redoPhil Hord2015-04-292-0/+63
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'jc/test-prereq-validate'Junio C Hamano2015-05-191-0/+9
|\ \ \ \ \ \ \
| * | | | | | | test: validate prerequistes syntaxjc/test-prereq-validateJunio C Hamano2015-04-281-0/+9
* | | | | | | | Merge branch 'bc/connect-plink'Junio C Hamano2015-05-192-22/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | connect: improve check for plink to reduce false positivesbc/connect-plinkbrian m. carlson2015-04-282-3/+48
| * | | | | | | | t5601: fix quotation error leading to skipped testsbrian m. carlson2015-04-281-1/+1
| * | | | | | | | connect: simplify SSH connection code pathbrian m. carlson2015-04-281-20/+20
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/test-chain-lint'Junio C Hamano2015-05-192-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | test-lib: turn on GIT_TEST_CHAIN_LINT by defaultjk/test-chain-lintJeff King2015-04-281-1/+1
| * | | | | | | | t7502-commit.sh: fix a broken and-chainRamsay Jones2015-04-281-1/+1
* | | | | | | | | Merge branch 'fg/document-commit-message-stripping'Junio C Hamano2015-05-191-4/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: clarify how "git commit" cleans up the edited log messagefg/document-commit-message-strippingFredrik Gustafsson2015-04-271-4/+7
* | | | | | | | | | Merge branch 'jk/stash-require-clean-index'Junio C Hamano2015-05-192-7/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stash: require a clean index to applyJeff King2015-04-222-0/+9