summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | 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
* | | | | | | | | | | | | Merge branch 'mm/push-simple-doc'Junio C Hamano2016-02-261-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation/git-push: document that 'simple' is the defaultmm/push-simple-docMatthieu Moy2016-02-231-0/+7
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jg/credential-cache-chdir-to-sockdir'Junio C Hamano2016-02-262-15/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | credential-cache--daemon: change to the socket dir on startupjg/credential-cache-chdir-to-sockdirJon Griffiths2016-02-231-0/+9
| * | | | | | | | | | | | | credential-cache--daemon: disallow relative socket pathJon Griffiths2016-02-232-1/+4
| * | | | | | | | | | | | | credential-cache--daemon: refactor check_socket_directoryJon Griffiths2016-02-231-15/+13
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ps/config-error'Junio C Hamano2016-02-2613-105/+159
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | config: rename git_config_set_or_die to git_config_setps/config-errorPatrick Steinhardt2016-02-2210-67/+67
| * | | | | | | | | | | | | config: rename git_config_set to git_config_set_gentlyPatrick Steinhardt2016-02-227-39/+40
| * | | | | | | | | | | | | compat: die when unable to set core.precomposeunicodePatrick Steinhardt2016-02-221-1/+2
| * | | | | | | | | | | | | sequencer: die on config error when saving replay optsPatrick Steinhardt2016-02-221-11/+11
| * | | | | | | | | | | | | init-db: die on config errors when initializing empty repoPatrick Steinhardt2016-02-221-10/+10
| * | | | | | | | | | | | | clone: die on config error in cmd_clonePatrick Steinhardt2016-02-221-4/+4
| * | | | | | | | | | | | | remote: die on config error when manipulating remotesPatrick Steinhardt2016-02-221-27/+12
| * | | | | | | | | | | | | remote: die on config error when setting/adding branchesPatrick Steinhardt2016-02-221-17/+9
| * | | | | | | | | | | | | remote: die on config error when setting URLPatrick Steinhardt2016-02-222-5/+15
| * | | | | | | | | | | | | submodule--helper: die on config error when cloning modulePatrick Steinhardt2016-02-221-2/+2
| * | | | | | | | | | | | | submodule: die on config error when linking modulesPatrick Steinhardt2016-02-221-5/+3
| * | | | | | | | | | | | | branch: die on config error when editing branch descriptionPatrick Steinhardt2016-02-221-3/+2
| * | | | | | | | | | | | | branch: die on config error when unsetting upstreamPatrick Steinhardt2016-02-222-2/+9
| * | | | | | | | | | | | | branch: report errors in tracking branch setupPatrick Steinhardt2016-02-223-16/+46
| * | | | | | | | | | | | | config: introduce set_or_die wrappersPatrick Steinhardt2016-02-162-0/+31