Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-context | Jeff King | 2015-05-27 | 4 | -20/+20 |
* | diff: accept color.diff.context as a synonym for "plain" | Jeff King | 2015-05-27 | 2 | -2/+3 |
* | Git 2.2.2v2.2.2 | Junio C Hamano | 2015-01-12 | 3 | -2/+33 |
* | Merge branch 'jk/read-packed-refs-without-path-max' into maint | Junio C Hamano | 2015-01-12 | 1 | -21/+25 |
|\ | |||||
| * | read_packed_refs: use skip_prefix instead of static arrayjk/read-packed-refs-without-path-max | Jeff King | 2014-12-10 | 1 | -3/+2 |
| * | read_packed_refs: pass strbuf to parse_ref_line | Jeff King | 2014-12-10 | 1 | -12/+15 |
| * | read_packed_refs: use a strbuf for reading lines | Jeff King | 2014-12-10 | 1 | -9/+11 |
* | | Merge branch 'mg/add-ignore-errors' into maint | Junio C Hamano | 2015-01-12 | 2 | -2/+8 |
|\ \ | |||||
| * | | add: ignore only ignored filesmg/add-ignore-errors | Michael J Gruber | 2014-11-21 | 2 | -2/+8 |
* | | | Merge branch 'mh/find-uniq-abbrev' into maint | Junio C Hamano | 2015-01-12 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrevmh/find-uniq-abbrev | Mike Hommey | 2014-11-26 | 1 | -1/+1 |
* | | | | Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maint | Junio C Hamano | 2015-01-12 | 2 | -9/+15 |
|\ \ \ \ | |||||
| * | | | | approxidate: allow ISO-like dates far in the futurejk/approxidate-avoid-y-d-m-over-future-dates | Jeff King | 2014-11-13 | 2 | -2/+5 |
| * | | | | pass TIME_DATE_NOW to approxidate future-check | Jeff King | 2014-11-13 | 1 | -7/+10 |
* | | | | | Merge branch 'rw/apply-does-not-take-ignore-date' into maint | Junio C Hamano | 2015-01-12 | 1 | -1/+0 |
|\ \ \ \ \ | |||||
| * | | | | | git-am.txt: --ignore-date flag is not passed to git-applyrw/apply-does-not-take-ignore-date | Ronald Wampler | 2014-12-09 | 1 | -1/+0 |
* | | | | | | Merge branch 'jk/for-each-reflog-ent-reverse' into maint | Junio C Hamano | 2015-01-12 | 2 | -12/+67 |
|\ \ \ \ \ \ | |||||
| * | | | | | | for_each_reflog_ent_reverse: turn leftover check into assertionjk/for-each-reflog-ent-reverse | Jeff King | 2014-12-05 | 1 | -1/+1 |
| * | | | | | | for_each_reflog_ent_reverse: fix newlines on block boundaries | Jeff King | 2014-12-05 | 2 | -11/+66 |
* | | | | | | | Merge branch 'maint-2.1' into maint | Junio C Hamano | 2015-01-07 | 2 | -12/+35 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'maint-2.0' into maint-2.1maint-2.1 | Junio C Hamano | 2015-01-07 | 2 | -12/+35 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'maint-1.9' into maint-2.0maint-2.0 | Junio C Hamano | 2015-01-07 | 2 | -12/+35 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch 'maint-1.8.5' into maint-1.9maint-1.9 | Junio C Hamano | 2015-01-07 | 2 | -12/+35 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5maint-1.8.5 | Junio C Hamano | 2015-01-07 | 2 | -12/+35 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | is_hfs_dotgit: loosen over-eager match of \u{..47}jk/dotgit-case-maint-1.8.5dotgit-case-maint-1.8.5 | Jeff King | 2014-12-29 | 2 | -12/+35 |
* | | | | | | | | | | | | Prepare for 2.2.2 | Junio C Hamano | 2014-12-22 | 2 | -1/+34 |
* | | | | | | | | | | | | Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' into maint | Junio C Hamano | 2014-12-22 | 1 | -4/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Makefile: have python scripts depend on NO_PYTHON settingjk/rebuild-perl-scripts-with-no-perl-seting-change | Jonathan Nieder | 2014-11-18 | 1 | -0/+3 |
| * | | | | | | | | | | | | Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macros | Jonathan Nieder | 2014-11-18 | 1 | -5/+5 |
| * | | | | | | | | | | | | Makefile: have perl scripts depend on NO_PERL setting | Jeff King | 2014-11-18 | 1 | -0/+3 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jk/no-perl-tests' into maint | Junio C Hamano | 2014-12-22 | 3 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t960[34]: mark cvsimport tests as requiring perljk/no-perl-tests | Jeff King | 2014-11-18 | 2 | -3/+3 |
| * | | | | | | | | | | | | t0090: mark add-interactive test with PERL prerequisite | Jeff King | 2014-11-18 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'po/everyday-doc' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Documentation: change "gitlink" typo in git-pushpo/everyday-doc | brian m. carlson | 2014-11-17 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge branch 'jk/push-simple' into maint | Junio C Hamano | 2014-12-22 | 2 | -6/+34 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | push: truly use "simple" as default, not "upstream"jk/push-simple | Jeff King | 2014-11-30 | 2 | -6/+34 |
* | | | | | | | | | | | | | | | Merge branch 'mh/config-flip-xbit-back-after-checking' into maint | Junio C Hamano | 2014-12-22 | 2 | -1/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | create_default_files(): don't set u+x bit on $GIT_DIR/configmh/config-flip-xbit-back-after-checking | Michael Haggerty | 2014-11-18 | 2 | -1/+9 |
* | | | | | | | | | | | | | | | | Merge branch 'jk/gitweb-with-newer-cgi-multi-param' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | gitweb: hack around CGI's list-context param() handlingjk/gitweb-with-newer-cgi-multi-param | Jeff King | 2014-11-18 | 1 | -1/+5 |
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'rs/receive-pack-use-labs' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | use labs() for variables of type long instead of abs()rs/receive-pack-use-labs | René Scharfe | 2014-11-17 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | Merge branch 'rs/maint-config-use-labs' into maint | Junio C Hamano | 2014-12-22 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | use labs() for variables of type long instead of abs()rs/maint-config-use-labs | René Scharfe | 2014-11-17 | 1 | -2/+2 |
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'js/windows-open-eisdir-error' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Windows: correct detection of EISDIR in mingw_open()js/windows-open-eisdir-error | Johannes Sixt | 2014-11-17 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'jk/colors-fix' into maint | Junio C Hamano | 2014-12-22 | 3 | -14/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | t4026: test "normal" colorjk/colors-fix | Jeff King | 2014-11-20 | 1 | -0/+8 |
| * | | | | | | | | | | | | | | | | | config: fix parsing of "git config --get-color some.key -1" | Jeff King | 2014-11-20 | 1 | -14/+13 |