summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* .mailmap: update long-lost friends with multiple defunct addressesJunio C Hamano2013-08-131-1/+13
* .mailmap: fixup entriesStefan Beller2013-08-091-2/+7
* .mailmap: Multiple addresses of Michael S. TsirkinStefan Beller2013-08-051-0/+3
* .mailmap: combine more (email, name) to individual personsStefan Beller2013-07-241-0/+4
* .mailmap: combine more (email, name) to individual personsStefan Beller2013-07-171-3/+7
* .mailmap: Combine more (email, name) to individual personsStefan Beller2013-07-151-7/+35
* .mailmap: Map email addresses to namesStefan Beller2013-07-121-25/+110
* Update draft release notes to 1.8.4Junio C Hamano2013-07-111-3/+76
* Merge branch 'jc/t1512-fix'Junio C Hamano2013-07-112-11/+23
|\
| * get_short_sha1(): correctly disambiguate type-limited abbreviationJunio C Hamano2013-07-011-1/+1
| * t1512: correct leftover constants from earlier editionJunio C Hamano2013-07-011-10/+22
* | Merge branch 'tr/test-v-and-v-subtest-only'Junio C Hamano2013-07-111-1/+2
|\ \
| * | t0000: do not use export X=Ytr/test-v-and-v-subtest-onlyTorsten Bögershausen2013-07-081-1/+2
* | | Merge branch 'af/rebase-i-merge-options'Junio C Hamano2013-07-112-5/+27
|\ \ \
| * | | Do not ignore merge options in interactive rebaseaf/rebase-i-merge-optionsArnaud Fontaine2013-07-022-5/+27
* | | | Merge branch 'pb/stash-refuse-to-kill'Junio C Hamano2013-07-115-8/+61
|\ \ \ \
| * | | | git stash: avoid data loss when "git stash save" kills a directoryPetr Baudis2013-07-013-2/+40
| * | | | treat_directory(): do not declare submodules to be untrackedJunio C Hamano2013-07-012-6/+21
* | | | | Merge branch 'jc/maint-diff-core-safecrlf'Junio C Hamano2013-07-112-1/+17
|\ \ \ \ \
| * | | | | diff: demote core.safecrlf=true to core.safecrlf=warnJunio C Hamano2013-06-252-1/+17
* | | | | | Merge branch 'jg/status-config'Junio C Hamano2013-07-114-19/+135
|\ \ \ \ \ \
| * | | | | | status/commit: make sure --porcelain is not affected by user-facing configJunio C Hamano2013-06-243-22/+61
| * | | | | | commit: make it work with status.shortRamkumar Ramachandra2013-06-241-0/+1
| * | | | | | status: introduce status.branch to enable --branch by defaultJorge Juan Garcia Garcia2013-06-243-0/+35
| * | | | | | status: introduce status.short to enable --short by defaultJorge Juan Garcia Garcia2013-06-243-0/+41
* | | | | | | Merge branch 'jk/bash-completion'Junio C Hamano2013-07-112-1/+4
|\ \ \ \ \ \ \
| * | | | | | | completion: learn about --man-pathJohn Keeping2013-06-302-0/+2
| * | | | | | | completion: handle unstuck form of base git optionsJohn Keeping2013-06-301-1/+2
* | | | | | | | Merge branch 'rr/rebase-checkout-reflog'Junio C Hamano2013-07-114-27/+72
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout: respect GIT_REFLOG_ACTIONRamkumar Ramachandra2013-06-172-7/+12
| * | | | | | | | status: do not depend on rebase reflog messagesRamkumar Ramachandra2013-06-172-21/+21
| * | | | | | | | t/t2021-checkout-last: "checkout -" should work after a rebase finishesRamkumar Ramachandra2013-06-171-0/+34
| * | | | | | | | wt-status: remove unused field in grab_1st_switch_cbdataRamkumar Ramachandra2013-06-171-2/+0
| * | | | | | | | t7512: test "detached from" as wellJunio C Hamano2013-06-171-1/+9
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/triangle-push-fixup'Junio C Hamano2013-07-113-46/+142
|\ \ \ \ \ \ \ \
| * | | | | | | | t/t5528-push-default: test pushdefault workflowsRamkumar Ramachandra2013-06-241-0/+57
| * | | | | | | | t/t5528-push-default: generalize test_push_*Ramkumar Ramachandra2013-06-241-2/+4
| * | | | | | | | push: change `simple` to accommodate triangular workflowsRamkumar Ramachandra2013-06-242-15/+38
| * | | | | | | | config doc: rewrite push.default sectionRamkumar Ramachandra2013-06-231-28/+44
| * | | | | | | | t/t5528-push-default: remove redundant test_config linesRamkumar Ramachandra2013-06-191-2/+0
* | | | | | | | | Merge branch 'mh/maint-lockfile-overflow'Junio C Hamano2013-07-111-4/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | lockfile: fix buffer overflow in path handlingMichael Haggerty2013-07-071-4/+6
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-07-052-19/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixup-builtins: retire an old transition helper scriptRamkumar Ramachandra2013-07-032-19/+0
* | | | | | | | | | | Merge branch 'tr/test-v-and-v-subtest-only'Junio C Hamano2013-07-056-53/+276
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | perf-lib: fix start/stop of perf testsThomas Gummerer2013-06-291-1/+2
| * | | | | | | | | | test-lib: support running tests under valgrind in parallelThomas Rast2013-06-231-22/+84
| * | | | | | | | | | test-lib: allow prefixing a custom string before "ok N" etc.Thomas Rast2013-06-231-12/+15
| * | | | | | | | | | test-lib: valgrind for only tests matching a patternThomas Rast2013-06-233-1/+43
| * | | | | | | | | | test-lib: verbose mode for only tests matching a patternThomas Rast2013-06-233-0/+60
View Lorry Controller Status