summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-02-22merge-strategies.txt: fix typoLibravatar Felipe Gonçalves Assis1-2/+2
2016-02-22diff: clarify textconv interfaceLibravatar Jeff King3-1/+24
2016-02-22Merge branch 'ks/svn-pathnameencoding-4' of git://git.bogomips.org/git-svnLibravatar Junio C Hamano4-14/+54
2016-02-22Merge branch 'pw/completion-stash'Libravatar Junio C Hamano1-2/+2
2016-02-22completion: fix mis-indentation in _git_stash()Libravatar SZEDER Gábor1-2/+2
2016-02-22config: rename git_config_set_or_die to git_config_setLibravatar Patrick Steinhardt10-67/+67
2016-02-22config: rename git_config_set to git_config_set_gentlyLibravatar Patrick Steinhardt7-39/+40
2016-02-22compat: die when unable to set core.precomposeunicodeLibravatar Patrick Steinhardt1-1/+2
2016-02-22sequencer: die on config error when saving replay optsLibravatar Patrick Steinhardt1-11/+11
2016-02-22init-db: die on config errors when initializing empty repoLibravatar Patrick Steinhardt1-10/+10
2016-02-22clone: die on config error in cmd_cloneLibravatar Patrick Steinhardt1-4/+4
2016-02-22remote: die on config error when manipulating remotesLibravatar Patrick Steinhardt1-27/+12
2016-02-22remote: die on config error when setting/adding branchesLibravatar Patrick Steinhardt1-17/+9
2016-02-22remote: die on config error when setting URLLibravatar Patrick Steinhardt2-5/+15
2016-02-22submodule--helper: die on config error when cloning moduleLibravatar Patrick Steinhardt1-2/+2
2016-02-22submodule: die on config error when linking modulesLibravatar Patrick Steinhardt1-5/+3
2016-02-22branch: die on config error when editing branch descriptionLibravatar Patrick Steinhardt1-3/+2
2016-02-22branch: die on config error when unsetting upstreamLibravatar Patrick Steinhardt2-2/+9
2016-02-22branch: report errors in tracking branch setupLibravatar Patrick Steinhardt3-16/+46
2016-02-22config: add '--show-origin' option to print the origin of a config valueLibravatar Lars Schneider3-5/+191
2016-02-22config: add 'origin_type' to config_source structLibravatar Lars Schneider5-18/+40
2016-02-21git.c: simplify stripping extension of a file in handle_builtin()Libravatar Alexander Kuleshov2-15/+15
2016-02-22git-svn: apply "svn.pathnameencoding" before URL encodingLibravatar Kazutoshi Satoda2-1/+17
2016-02-22git-svn: enable "svn.pathnameencoding" on dcommitLibravatar Kazutoshi Satoda2-2/+24
2016-02-22git-svn: hoist out utf8 prep from t9129 to lib-git-svnLibravatar Eric Wong2-11/+13
2016-02-20tests: rename work-tree tests to *work-tree*Libravatar Michael J Gruber3-0/+0
2016-02-19exec_cmd.c: use find_last_dir_sep() for code simplificationLibravatar Alexander Kuleshov1-4/+2
2016-02-19rename git_config_from_buf to git_config_from_memLibravatar Lars Schneider3-4/+4
2016-02-19tree-diff: catch integer overflow in combine_diff_path allocationLibravatar Jeff King2-4/+4
2016-02-19add helpers for detecting size_t overflowLibravatar Jeff King1-0/+34
2016-02-19reflog_expire_cfg: NUL-terminate pattern fieldLibravatar Jeff King1-5/+3
2016-02-17ref-filter: introduce objectname_atom_parser()Libravatar Karthik Nayak1-11/+24
2016-02-17ref-filter: introduce contents_atom_parser()Libravatar Karthik Nayak1-29/+50
2016-02-17ref-filter: introduce remote_ref_atom_parser()Libravatar Karthik Nayak1-42/+61
2016-02-17ref-filter: align: introduce long-form syntaxLibravatar Karthik Nayak3-9/+63
2016-02-17ref-filter: introduce align_atom_parser()Libravatar Karthik Nayak1-51/+40
2016-02-17ref-filter: introduce parse_align_position()Libravatar Karthik Nayak1-6/+15
2016-02-17ref-filter: introduce color_atom_parser()Libravatar Karthik Nayak1-9/+16
2016-02-17ref-filter: introduce parsing functions for each valid atomLibravatar Karthik Nayak1-4/+10
2016-02-17ref-filter: introduce struct used_atomLibravatar Karthik Nayak1-17/+18
2016-02-17ref-filter: bump 'used_atom' and related code to the topLibravatar Karthik Nayak1-15/+15
2016-02-17ref-filter: use string_list_split over strbuf_splitLibravatar Jeff King1-18/+11
2016-02-17t: do not hide Git's exit code in tests using 'nul_to_q'Libravatar Lars Schneider2-3/+6
2016-02-17merge-recursive: more consistent interfaceLibravatar Felipe Gonçalves Assis2-5/+10
2016-02-17merge-recursive: option to disable renamesLibravatar Felipe Gonçalves Assis3-0/+14
2016-02-17Merge branch 'maint'Libravatar Junio C Hamano2-1/+28
2016-02-17Seventh batch for the 2.8 cycleLibravatar Junio C Hamano1-0/+43
2016-02-17Merge branch 'dw/mergetool-vim-window-shuffle'Libravatar Junio C Hamano1-2/+2
2016-02-17Merge branch 'ah/stripspace-optstring'Libravatar Junio C Hamano1-1/+1
2016-02-17Merge branch 'mm/clean-doc-fix'Libravatar Junio C Hamano1-3/+1