summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* index-pack: add a helper function to derive .idx/.keep filenamejc/index-packJunio C Hamano2016-03-031-18/+17
* Merge branch 'jc/maint-index-pack-keep' into jc/index-packJunio C Hamano2016-03-032-1/+7
|\
| * index-pack: correct --keep[=<msg>]jc/maint-index-pack-keepJunio C Hamano2016-03-032-1/+7
* | Git 2.8-rc0v2.8.0-rc0Junio C Hamano2016-02-262-1/+96
* | Merge branch 'mm/readme-markdown'Junio C Hamano2016-02-262-26/+32
|\ \
| * | README.md: move down historical explanation about the nameMatthieu Moy2016-02-251-11/+13
| * | README.md: don't call git stupid in the titleMatthieu Moy2016-02-251-2/+2
| * | README.md: move the link to git-scm.com upMatthieu Moy2016-02-251-3/+3
| * | README.md: add hyperlinks on filenamesMatthieu Moy2016-02-251-6/+13
| * | README: use markdown syntaxMatthieu Moy2016-02-252-6/+3
* | | Merge branch 'ma/update-hooks-sample-typofix'Junio C Hamano2016-02-261-1/+1
|\ \ \
| * | | templates/hooks: fix minor typo in the sample update-hookma/update-hooks-sample-typofixMartin Amdisen2016-02-251-1/+1
* | | | Merge branch 'ls/makefile-cflags-developer-tweak'Junio C Hamano2016-02-263-1/+18
|\ \ \ \
| * | | | add DEVELOPER makefile knob to check for acknowledged warningsls/makefile-cflags-developer-tweakLars Schneider2016-02-253-1/+18
* | | | | Merge branch 'dt/initial-ref-xn-commit-doc'Junio C Hamano2016-02-261-0/+12
|\ \ \ \ \
| * | | | | refs: document transaction semanticsdt/initial-ref-xn-commit-docDavid Turner2016-02-251-0/+12
* | | | | | Merge branch 'js/config-set-in-non-repository'Junio C Hamano2016-02-262-0/+14
|\ \ \ \ \ \
| * | | | | | git config: report when trying to modify a non-existing repo configjs/config-set-in-non-repositoryJohannes Schindelin2016-02-252-0/+14
* | | | | | | Merge branch 'jk/epipe-in-async'Junio C Hamano2016-02-266-3/+25
|\ \ \ \ \ \ \
| * | | | | | | t5504: handle expected output from SIGPIPE deathjk/epipe-in-asyncJeff King2016-02-251-1/+4
| * | | | | | | test_must_fail: report number of unexpected signalJeff King2016-02-251-1/+1
| * | | | | | | fetch-pack: ignore SIGPIPE in sideband demuxerJeff King2016-02-251-1/+5
| * | | | | | | write_or_die: handle EPIPE in async threadsJeff King2016-02-253-0/+15
| |/ / / / / /
* | | | | | | Merge branch 'mm/push-default-warning'Junio C Hamano2016-02-261-34/+0
|\ \ \ \ \ \ \
| * | | | | | | push: remove "push.default is unset" warning messagemm/push-default-warningMatthieu Moy2016-02-251-34/+0
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'fa/merge-recursive-no-rename'Junio C Hamano2016-02-265-4/+337
|\ \ \ \ \ \ \
| * | | | | | | t3034: test deprecated interfacefa/merge-recursive-no-renameFelipe Gonçalves Assis2016-02-241-0/+46
| * | | | | | | t3034: test option to disable renamesFelipe Gonçalves Assis2016-02-241-0/+28
| * | | | | | | t3034: add rename threshold testsFelipe Gonçalves Assis2016-02-242-1/+239
| * | | | | | | merge-recursive: find-renames resets thresholdFelipe Gonçalves Assis2016-02-241-1/+3
| * | | | | | | merge-strategies.txt: fix typoFelipe Gonçalves Assis2016-02-221-2/+2
| * | | | | | | merge-recursive: more consistent interfaceFelipe Gonçalves Assis2016-02-172-5/+10
| * | | | | | | merge-recursive: option to disable renamesFelipe Gonçalves Assis2016-02-173-0/+14
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'sb/submodule-fetch-nontip'Junio C Hamano2016-02-261-3/+26
|\ \ \ \ \ \ \
| * | | | | | | submodule: try harder to fetch needed sha1 by direct fetching sha1sb/submodule-fetch-nontipStefan Beller2016-02-241-3/+26
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'sb/submodule-module-list-fix'Junio C Hamano2016-02-262-8/+27
|\ \ \ \ \ \ \
| * | | | | | | submodule helper list: respect correct path prefixsb/submodule-module-list-fixStefan Beller2016-02-242-8/+27
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'tb/conversion'Junio C Hamano2016-02-262-232/+272
|\ \ \ \ \ \ \
| * | | | | | | convert.c: correct attr_action()tb/conversionTorsten Bögershausen2016-02-232-16/+35
| * | | | | | | convert.c: simplify text_statTorsten Bögershausen2016-02-101-25/+22
| * | | | | | | convert.c: refactor crlf_actionTorsten Bögershausen2016-02-101-31/+46
| * | | | | | | convert.c: use text_eol_is_crlf()Torsten Bögershausen2016-02-081-6/+14
| * | | | | | | convert.c: remove input_crlf_action()Torsten Bögershausen2016-02-081-23/+14
| * | | | | | | convert.c: remove unused parameter 'path'Torsten Bögershausen2016-02-081-10/+9
| * | | | | | | t0027: add tests for get_stream_filter()Torsten Bögershausen2016-02-081-135/+146
* | | | | | | | Merge branch 'jk/grep-binary-workaround-in-test'Junio C Hamano2016-02-262-13/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | t9200: avoid grep on non-ASCII datajk/grep-binary-workaround-in-testJohn Keeping2016-02-231-1/+1
| * | | | | | | | t8005: avoid grep on non-ASCII dataJohn Keeping2016-02-231-12/+16
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'ps/plug-xdl-merge-leak'Junio C Hamano2016-02-261-2/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | xdiff/xmerge: fix memory leak in xdl_mergeps/plug-xdl-merge-leakPatrick Steinhardt2016-02-231-2/+7