aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Third batch for 2.5 cycleJunio C Hamano2015-05-19
* Merge branch 'sb/ref-lock-lose-lock-fd'Junio C Hamano2015-05-19
|\
| * refs.c: remove lock_fd from struct ref_lockStefan Beller2015-05-10
* | Merge branch 'kn/cat-file-literally'Junio C Hamano2015-05-19
|\ \
| * | t1006: add tests for git cat-file --allow-unknown-typeKarthik Nayak2015-05-06
| * | cat-file: teach cat-file a '--allow-unknown-type' optionKarthik Nayak2015-05-06
| * | cat-file: make the options mutually exclusiveKarthik Nayak2015-05-06
| * | sha1_file: support reading from a loose object of unknown typeKarthik Nayak2015-05-06
* | | Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano2015-05-19
|\ \ \
| * | | pathspec: avoid the need of "--" when wildcard is usedDuy Nguyen2015-05-03
* | | | Merge branch 'jc/merge'Junio C Hamano2015-05-19
|\ \ \ \
| * | | | merge: deprecate 'git merge <message> HEAD <commit>' syntaxJunio C Hamano2015-04-29
| * | | | merge: handle FETCH_HEAD internallyJunio C Hamano2015-04-29
| * | | | merge: decide if we auto-generate the message early in collect_parents()Junio C Hamano2015-04-29
| * | | | merge: make collect_parents() auto-generate the merge messageJunio C Hamano2015-04-29
| * | | | merge: extract prepare_merge_message() logic outJunio C Hamano2015-04-29
| * | | | merge: narrow scope of merge_namesJunio C Hamano2015-04-29
| * | | | merge: split reduce_parents() out of collect_parents()Junio C Hamano2015-04-29
| * | | | merge: clarify collect_parents() logicJunio C Hamano2015-04-29
| * | | | merge: small leakfix and code simplificationJunio C Hamano2015-04-29
| * | | | merge: do not check argc to determine number of remote headsJunio C Hamano2015-04-29
| * | | | merge: clarify "pulling into void" special caseJunio C Hamano2015-04-29
| * | | | t5520: test pulling an octopus into an unborn branchJunio C Hamano2015-04-29
| * | | | t5520: style fixesJunio C Hamano2015-04-29
| * | | | merge: simplify code flowJunio C Hamano2015-04-29
| * | | | merge: test the top-level merge driverJunio C Hamano2015-04-29
* | | | | Merge branch 'ph/rebase-i-redo'Junio C Hamano2015-05-19
|\ \ \ \ \
| * | | | | rebase -i: redo tasks that die during cherry-pickPhil Hord2015-04-29
* | | | | | Merge branch 'jc/test-prereq-validate'Junio C Hamano2015-05-19
|\ \ \ \ \ \
| * | | | | | test: validate prerequistes syntaxJunio C Hamano2015-04-28
* | | | | | | Merge branch 'bc/connect-plink'Junio C Hamano2015-05-19
|\ \ \ \ \ \ \
| * | | | | | | connect: improve check for plink to reduce false positivesbrian m. carlson2015-04-28
| * | | | | | | t5601: fix quotation error leading to skipped testsbrian m. carlson2015-04-28
| * | | | | | | connect: simplify SSH connection code pathbrian m. carlson2015-04-28
| |/ / / / / /
* | | | | | | Merge branch 'jk/test-chain-lint'Junio C Hamano2015-05-19
|\ \ \ \ \ \ \
| * | | | | | | test-lib: turn on GIT_TEST_CHAIN_LINT by defaultJeff King2015-04-28
| * | | | | | | t7502-commit.sh: fix a broken and-chainRamsay Jones2015-04-28
* | | | | | | | Merge branch 'fg/document-commit-message-stripping'Junio C Hamano2015-05-19
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: clarify how "git commit" cleans up the edited log messageFredrik Gustafsson2015-04-27
* | | | | | | | | Merge branch 'jk/stash-require-clean-index'Junio C Hamano2015-05-19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stash: require a clean index to applyJeff King2015-04-22
| * | | | | | | | | t3903: avoid applying onto dirty indexJeff King2015-04-22
| * | | | | | | | | t3903: stop hard-coding commit sha1sJeff King2015-04-22
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/git-no-more-argv0-path-munging'Junio C Hamano2015-05-19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stop putting argv[0] dirname at front of PATHJeff King2015-04-22
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jc/gitignore-precedence'Junio C Hamano2015-05-19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ignore: info/exclude should trump core.excludesfileJunio C Hamano2015-04-22
* | | | | | | | | | Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-05-19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff-lib.c: adjust position of i-t-a entries in diffNguyễn Thái Ngọc Duy2015-03-23
* | | | | | | | | | | Sync with 2.4.1Junio C Hamano2015-05-13
|\ \ \ \ \ \ \ \ \ \ \