aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | t3034: add rename threshold testsFelipe Gonçalves Assis2016-02-24
| * | | | | | | | | | | merge-recursive: find-renames resets thresholdFelipe Gonçalves Assis2016-02-24
| * | | | | | | | | | | merge-strategies.txt: fix typoFelipe Gonçalves Assis2016-02-22
| * | | | | | | | | | | merge-recursive: more consistent interfaceFelipe Gonçalves Assis2016-02-17
| * | | | | | | | | | | merge-recursive: option to disable renamesFelipe Gonçalves Assis2016-02-17
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sb/submodule-fetch-nontip'Junio C Hamano2016-02-26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | submodule: try harder to fetch needed sha1 by direct fetching sha1Stefan Beller2016-02-24
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sb/submodule-module-list-fix'Junio C Hamano2016-02-26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | submodule helper list: respect correct path prefixStefan Beller2016-02-24
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'tb/conversion'Junio C Hamano2016-02-26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | convert.c: correct attr_action()Torsten Bögershausen2016-02-23
| * | | | | | | | | | | convert.c: simplify text_statTorsten Bögershausen2016-02-10
| * | | | | | | | | | | convert.c: refactor crlf_actionTorsten Bögershausen2016-02-10
| * | | | | | | | | | | convert.c: use text_eol_is_crlf()Torsten Bögershausen2016-02-08
| * | | | | | | | | | | convert.c: remove input_crlf_action()Torsten Bögershausen2016-02-08
| * | | | | | | | | | | convert.c: remove unused parameter 'path'Torsten Bögershausen2016-02-08
| * | | | | | | | | | | t0027: add tests for get_stream_filter()Torsten Bögershausen2016-02-08
* | | | | | | | | | | | Merge branch 'jk/grep-binary-workaround-in-test'Junio C Hamano2016-02-26
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t9200: avoid grep on non-ASCII dataJohn Keeping2016-02-23
| * | | | | | | | | | | | t8005: avoid grep on non-ASCII dataJohn Keeping2016-02-23
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ps/plug-xdl-merge-leak'Junio C Hamano2016-02-26
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | xdiff/xmerge: fix memory leak in xdl_mergePatrick Steinhardt2016-02-23
* | | | | | | | | | | | | Merge branch 'mm/push-simple-doc'Junio C Hamano2016-02-26
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation/git-push: document that 'simple' is the defaultMatthieu Moy2016-02-23
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jg/credential-cache-chdir-to-sockdir'Junio C Hamano2016-02-26
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | credential-cache--daemon: change to the socket dir on startupJon Griffiths2016-02-23
| * | | | | | | | | | | | | credential-cache--daemon: disallow relative socket pathJon Griffiths2016-02-23
| * | | | | | | | | | | | | credential-cache--daemon: refactor check_socket_directoryJon Griffiths2016-02-23
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ps/config-error'Junio C Hamano2016-02-26
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | config: rename git_config_set_or_die to git_config_setPatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | config: rename git_config_set to git_config_set_gentlyPatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | compat: die when unable to set core.precomposeunicodePatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | sequencer: die on config error when saving replay optsPatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | init-db: die on config errors when initializing empty repoPatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | clone: die on config error in cmd_clonePatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | remote: die on config error when manipulating remotesPatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | remote: die on config error when setting/adding branchesPatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | remote: die on config error when setting URLPatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | submodule--helper: die on config error when cloning modulePatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | submodule: die on config error when linking modulesPatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | branch: die on config error when editing branch descriptionPatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | branch: die on config error when unsetting upstreamPatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | branch: report errors in tracking branch setupPatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | config: introduce set_or_die wrappersPatrick Steinhardt2016-02-16
* | | | | | | | | | | | | | Merge branch 'mg/work-tree-tests'Junio C Hamano2016-02-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | tests: rename work-tree tests to *work-tree*Michael J Gruber2016-02-20
* | | | | | | | | | | | | | | Merge branch 'ls/config-origin'Junio C Hamano2016-02-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | config: add '--show-origin' option to print the origin of a config valueLars Schneider2016-02-22
| * | | | | | | | | | | | | | | config: add 'origin_type' to config_source structLars Schneider2016-02-22
| * | | | | | | | | | | | | | | rename git_config_from_buf to git_config_from_memLars Schneider2016-02-19