Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | write_or_die: handle EPIPE in async threads | Jeff King | 2016-02-25 | 3 | -0/+15 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'mm/push-default-warning' | Junio C Hamano | 2016-02-26 | 1 | -34/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | push: remove "push.default is unset" warning messagemm/push-default-warning | Matthieu Moy | 2016-02-25 | 1 | -34/+0 | |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'fa/merge-recursive-no-rename' | Junio C Hamano | 2016-02-26 | 5 | -4/+337 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | t3034: test deprecated interfacefa/merge-recursive-no-rename | Felipe Gonçalves Assis | 2016-02-24 | 1 | -0/+46 | |
| * | | | | | | | | | | | t3034: test option to disable renames | Felipe Gonçalves Assis | 2016-02-24 | 1 | -0/+28 | |
| * | | | | | | | | | | | t3034: add rename threshold tests | Felipe Gonçalves Assis | 2016-02-24 | 2 | -1/+239 | |
| * | | | | | | | | | | | merge-recursive: find-renames resets threshold | Felipe Gonçalves Assis | 2016-02-24 | 1 | -1/+3 | |
| * | | | | | | | | | | | merge-strategies.txt: fix typo | Felipe Gonçalves Assis | 2016-02-22 | 1 | -2/+2 | |
| * | | | | | | | | | | | merge-recursive: more consistent interface | Felipe Gonçalves Assis | 2016-02-17 | 2 | -5/+10 | |
| * | | | | | | | | | | | merge-recursive: option to disable renames | Felipe Gonçalves Assis | 2016-02-17 | 3 | -0/+14 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'sb/submodule-fetch-nontip' | Junio C Hamano | 2016-02-26 | 1 | -3/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | submodule: try harder to fetch needed sha1 by direct fetching sha1sb/submodule-fetch-nontip | Stefan Beller | 2016-02-24 | 1 | -3/+26 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'sb/submodule-module-list-fix' | Junio C Hamano | 2016-02-26 | 2 | -8/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | submodule helper list: respect correct path prefixsb/submodule-module-list-fix | Stefan Beller | 2016-02-24 | 2 | -8/+27 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'tb/conversion' | Junio C Hamano | 2016-02-26 | 2 | -232/+272 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | convert.c: correct attr_action()tb/conversion | Torsten Bögershausen | 2016-02-23 | 2 | -16/+35 | |
| * | | | | | | | | | | | convert.c: simplify text_stat | Torsten Bögershausen | 2016-02-10 | 1 | -25/+22 | |
| * | | | | | | | | | | | convert.c: refactor crlf_action | Torsten Bögershausen | 2016-02-10 | 1 | -31/+46 | |
| * | | | | | | | | | | | convert.c: use text_eol_is_crlf() | Torsten Bögershausen | 2016-02-08 | 1 | -6/+14 | |
| * | | | | | | | | | | | convert.c: remove input_crlf_action() | Torsten Bögershausen | 2016-02-08 | 1 | -23/+14 | |
| * | | | | | | | | | | | convert.c: remove unused parameter 'path' | Torsten Bögershausen | 2016-02-08 | 1 | -10/+9 | |
| * | | | | | | | | | | | t0027: add tests for get_stream_filter() | Torsten Bögershausen | 2016-02-08 | 1 | -135/+146 | |
* | | | | | | | | | | | | Merge branch 'jk/grep-binary-workaround-in-test' | Junio C Hamano | 2016-02-26 | 2 | -13/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | t9200: avoid grep on non-ASCII datajk/grep-binary-workaround-in-test | John Keeping | 2016-02-23 | 1 | -1/+1 | |
| * | | | | | | | | | | | | t8005: avoid grep on non-ASCII data | John Keeping | 2016-02-23 | 1 | -12/+16 | |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ps/plug-xdl-merge-leak' | Junio C Hamano | 2016-02-26 | 1 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | xdiff/xmerge: fix memory leak in xdl_mergeps/plug-xdl-merge-leak | Patrick Steinhardt | 2016-02-23 | 1 | -2/+7 | |
* | | | | | | | | | | | | | Merge branch 'mm/push-simple-doc' | Junio C Hamano | 2016-02-26 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Documentation/git-push: document that 'simple' is the defaultmm/push-simple-doc | Matthieu Moy | 2016-02-23 | 1 | -0/+7 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jg/credential-cache-chdir-to-sockdir' | Junio C Hamano | 2016-02-26 | 2 | -15/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | credential-cache--daemon: change to the socket dir on startupjg/credential-cache-chdir-to-sockdir | Jon Griffiths | 2016-02-23 | 1 | -0/+9 | |
| * | | | | | | | | | | | | | credential-cache--daemon: disallow relative socket path | Jon Griffiths | 2016-02-23 | 2 | -1/+4 | |
| * | | | | | | | | | | | | | credential-cache--daemon: refactor check_socket_directory | Jon Griffiths | 2016-02-23 | 1 | -15/+13 | |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'ps/config-error' | Junio C Hamano | 2016-02-26 | 13 | -105/+159 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | config: rename git_config_set_or_die to git_config_setps/config-error | Patrick Steinhardt | 2016-02-22 | 10 | -67/+67 | |
| * | | | | | | | | | | | | | config: rename git_config_set to git_config_set_gently | Patrick Steinhardt | 2016-02-22 | 7 | -39/+40 | |
| * | | | | | | | | | | | | | compat: die when unable to set core.precomposeunicode | Patrick Steinhardt | 2016-02-22 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | sequencer: die on config error when saving replay opts | Patrick Steinhardt | 2016-02-22 | 1 | -11/+11 | |
| * | | | | | | | | | | | | | init-db: die on config errors when initializing empty repo | Patrick Steinhardt | 2016-02-22 | 1 | -10/+10 | |
| * | | | | | | | | | | | | | clone: die on config error in cmd_clone | Patrick Steinhardt | 2016-02-22 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | remote: die on config error when manipulating remotes | Patrick Steinhardt | 2016-02-22 | 1 | -27/+12 | |
| * | | | | | | | | | | | | | remote: die on config error when setting/adding branches | Patrick Steinhardt | 2016-02-22 | 1 | -17/+9 | |
| * | | | | | | | | | | | | | remote: die on config error when setting URL | Patrick Steinhardt | 2016-02-22 | 2 | -5/+15 | |
| * | | | | | | | | | | | | | submodule--helper: die on config error when cloning module | Patrick Steinhardt | 2016-02-22 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | submodule: die on config error when linking modules | Patrick Steinhardt | 2016-02-22 | 1 | -5/+3 | |
| * | | | | | | | | | | | | | branch: die on config error when editing branch description | Patrick Steinhardt | 2016-02-22 | 1 | -3/+2 | |
| * | | | | | | | | | | | | | branch: die on config error when unsetting upstream | Patrick Steinhardt | 2016-02-22 | 2 | -2/+9 | |
| * | | | | | | | | | | | | | branch: report errors in tracking branch setup | Patrick Steinhardt | 2016-02-22 | 3 | -16/+46 | |
| * | | | | | | | | | | | | | config: introduce set_or_die wrappers | Patrick Steinhardt | 2016-02-16 | 2 | -0/+31 |