aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'ma/update-hooks-sample-typofix'Junio C Hamano2016-02-26
|\
| * templates/hooks: fix minor typo in the sample update-hookMartin Amdisen2016-02-25
* | Merge branch 'ls/makefile-cflags-developer-tweak'Junio C Hamano2016-02-26
|\ \
| * | add DEVELOPER makefile knob to check for acknowledged warningsLars Schneider2016-02-25
* | | Merge branch 'dt/initial-ref-xn-commit-doc'Junio C Hamano2016-02-26
|\ \ \
| * | | refs: document transaction semanticsDavid Turner2016-02-25
* | | | Merge branch 'js/config-set-in-non-repository'Junio C Hamano2016-02-26
|\ \ \ \
| * | | | git config: report when trying to modify a non-existing repo configJohannes Schindelin2016-02-25
* | | | | Merge branch 'jk/epipe-in-async'Junio C Hamano2016-02-26
|\ \ \ \ \
| * | | | | t5504: handle expected output from SIGPIPE deathJeff King2016-02-25
| * | | | | test_must_fail: report number of unexpected signalJeff King2016-02-25
| * | | | | fetch-pack: ignore SIGPIPE in sideband demuxerJeff King2016-02-25
| * | | | | write_or_die: handle EPIPE in async threadsJeff King2016-02-25
| |/ / / /
* | | | | Merge branch 'mm/push-default-warning'Junio C Hamano2016-02-26
|\ \ \ \ \
| * | | | | push: remove "push.default is unset" warning messageMatthieu Moy2016-02-25
* | | | | | Merge branch 'fa/merge-recursive-no-rename'Junio C Hamano2016-02-26
|\ \ \ \ \ \
| * | | | | | t3034: test deprecated interfaceFelipe Gonçalves Assis2016-02-24
| * | | | | | t3034: test option to disable renamesFelipe Gonçalves Assis2016-02-24
| * | | | | | 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