summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t5520: check reflog action in fast-forward mergept/pull-testsPaul Tan2015-05-291-3/+10
* t5521: test --dry-run does not make any changesPaul Tan2015-05-291-0/+13
* t5520: test --rebase failure on unborn branch with indexPaul Tan2015-05-291-0/+15
* t5520: test --rebase with multiple branchesPaul Tan2015-05-291-0/+9
* t5520: test work tree fast-forward when fetch updates headPaul Tan2015-05-291-0/+21
* t5520: test for failure if index has unresolved entriesPaul Tan2015-05-291-0/+19
* t5520: test no merge candidates casesPaul Tan2015-05-181-0/+55
* t5520: prevent field splitting in content comparisonsPaul Tan2015-05-181-35/+35
* 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
* Git 2.2.2v2.2.2Junio C Hamano2015-01-123-2/+33
* Merge branch 'jk/read-packed-refs-without-path-max' into maintJunio C Hamano2015-01-121-21/+25
|\
| * read_packed_refs: use skip_prefix instead of static arrayjk/read-packed-refs-without-path-maxJeff King2014-12-101-3/+2
| * read_packed_refs: pass strbuf to parse_ref_lineJeff King2014-12-101-12/+15
| * read_packed_refs: use a strbuf for reading linesJeff King2014-12-101-9/+11
* | Merge branch 'mg/add-ignore-errors' into maintJunio C Hamano2015-01-122-2/+8
|\ \
| * | add: ignore only ignored filesmg/add-ignore-errorsMichael J Gruber2014-11-212-2/+8
* | | Merge branch 'mh/find-uniq-abbrev' into maintJunio C Hamano2015-01-121-1/+1
|\ \ \
| * | | sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrevmh/find-uniq-abbrevMike Hommey2014-11-261-1/+1
* | | | Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maintJunio C Hamano2015-01-122-9/+15
|\ \ \ \
| * | | | approxidate: allow ISO-like dates far in the futurejk/approxidate-avoid-y-d-m-over-future-datesJeff King2014-11-132-2/+5
| * | | | pass TIME_DATE_NOW to approxidate future-checkJeff King2014-11-131-7/+10
* | | | | Merge branch 'rw/apply-does-not-take-ignore-date' into maintJunio C Hamano2015-01-121-1/+0
|\ \ \ \ \
| * | | | | git-am.txt: --ignore-date flag is not passed to git-applyrw/apply-does-not-take-ignore-dateRonald Wampler2014-12-091-1/+0
* | | | | | Merge branch 'jk/for-each-reflog-ent-reverse' into maintJunio C Hamano2015-01-122-12/+67
|\ \ \ \ \ \
| * | | | | | for_each_reflog_ent_reverse: turn leftover check into assertionjk/for-each-reflog-ent-reverseJeff King2014-12-051-1/+1
| * | | | | | for_each_reflog_ent_reverse: fix newlines on block boundariesJeff King2014-12-052-11/+66
* | | | | | | Merge branch 'maint-2.1' into maintJunio C Hamano2015-01-072-12/+35
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'maint-2.0' into maint-2.1maint-2.1Junio C Hamano2015-01-072-12/+35
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'maint-1.9' into maint-2.0maint-2.0Junio C Hamano2015-01-072-12/+35
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'maint-1.8.5' into maint-1.9maint-1.9Junio C Hamano2015-01-072-12/+35
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5maint-1.8.5Junio C Hamano2015-01-072-12/+35
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | is_hfs_dotgit: loosen over-eager match of \u{..47}jk/dotgit-case-maint-1.8.5dotgit-case-maint-1.8.5Jeff King2014-12-292-12/+35
* | | | | | | | | | | | Prepare for 2.2.2Junio C Hamano2014-12-222-1/+34
* | | | | | | | | | | | Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' into maintJunio C Hamano2014-12-221-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Makefile: have python scripts depend on NO_PYTHON settingjk/rebuild-perl-scripts-with-no-perl-seting-changeJonathan Nieder2014-11-181-0/+3
| * | | | | | | | | | | | Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macrosJonathan Nieder2014-11-181-5/+5
View Lorry Controller Status