summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2015-08-31Merge branch 'sg/describe-contains'Libravatar Junio C Hamano1-4/+4
2015-08-31Merge branch 'db/push-sign-if-asked'Libravatar Junio C Hamano2-106/+128
2015-08-31Merge branch 'jk/notes-merge-config'Libravatar Junio C Hamano1-13/+30
2015-08-31Merge branch 'jc/am-state-fix'Libravatar Junio C Hamano4-34/+48
2015-08-31Merge branch 'jc/log-p-cc'Libravatar Junio C Hamano1-9/+16
2015-08-31Merge branch 'jk/rev-list-has-no-notes'Libravatar Junio C Hamano1-0/+3
2015-08-31Merge branch 'hv/submodule-config'Libravatar Junio C Hamano2-0/+2
2015-08-31Merge branch 'sg/config-name-only'Libravatar Junio C Hamano1-45/+41
2015-08-26Merge branch 'jc/calloc-pathspec'Libravatar Junio C Hamano2-2/+2
2015-08-26Merge branch 'pt/am-builtin'Libravatar Junio C Hamano1-1/+1
2015-08-26Merge branch 'pt/am-builtin-abort-fix'Libravatar Junio C Hamano1-13/+36
2015-08-26i18n: am: fix typo in description of -b optionLibravatar Jiang Xin1-1/+1
2015-08-25Merge branch 'mh/tempfile'Libravatar Junio C Hamano4-29/+20
2015-08-25Merge branch 'pt/am-builtin-options'Libravatar Junio C Hamano1-6/+36
2015-08-25Merge branch 'dt/notes-multiple'Libravatar Junio C Hamano1-0/+6
2015-08-25builtin/log.c: minor reformatLibravatar Junio C Hamano1-4/+2
2015-08-25write_file(): drop caller-supplied LF from calls to create a one-liner fileLibravatar Junio C Hamano2-6/+6
2015-08-25write_file_v(): do not leave incomplete line at the endLibravatar Junio C Hamano1-8/+2
2015-08-25describe --contains: default to HEAD when no commit-ish is givenLibravatar SZEDER Gábor1-4/+4
2015-08-24write_file(): drop "fatal" parameterLibravatar Junio C Hamano4-9/+9
2015-08-24builtin/am: make sure state files are textLibravatar Junio C Hamano1-2/+8
2015-08-24builtin/am: introduce write_state_*() helper functionsLibravatar Junio C Hamano1-27/+41
2015-08-24rev-list: make it obvious that we do not support notesLibravatar Jeff King1-0/+3
2015-08-20log: show merge commit when --cc is givenLibravatar Junio C Hamano1-0/+4
2015-08-20log: when --cc is given, default to -p unless told otherwiseLibravatar Junio C Hamano1-0/+4
2015-08-20log: rename "tweak" helpersLibravatar Junio C Hamano1-5/+6
2015-08-20get_urlmatch: avoid useless strbuf writeLibravatar Jeff King1-4/+1
2015-08-20format_config: simplify buffer handlingLibravatar Jeff King1-22/+16
2015-08-20format_config: don't init strbufLibravatar Jeff King1-2/+1
2015-08-20config: restructure format_config() for better control flowLibravatar SZEDER Gábor1-41/+37
2015-08-20ps_matched: xcalloc() takes nmemb and then element sizeLibravatar Junio C Hamano2-2/+2
2015-08-19Merge branch 'jk/git-path'Libravatar Junio C Hamano9-69/+84
2015-08-19Merge branch 'jc/finalize-temp-file'Libravatar Junio C Hamano1-2/+2
2015-08-19Merge branch 'ps/guess-repo-name-at-root'Libravatar Junio C Hamano1-10/+52
2015-08-19Merge branch 'jk/guess-repo-name-regression-fix'Libravatar Junio C Hamano1-1/+2
2015-08-19Merge branch 'sb/remove-unused-var-from-builtin-add' into maintLibravatar Junio C Hamano1-2/+0
2015-08-19Merge branch 'ib/scripted-parse-opt-better-hint-string' into maintLibravatar Junio C Hamano1-27/+30
2015-08-19Merge branch 'db/send-pack-user-signingkey' into maintLibravatar Junio C Hamano1-0/+3
2015-08-19Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maintLibravatar Junio C Hamano1-1/+1
2015-08-19push: add a config option push.gpgSign for default signed pushesLibravatar Dave Borowitz2-15/+62
2015-08-19push: support signing pushes iff the server supports itLibravatar Dave Borowitz2-3/+23
2015-08-19builtin/send-pack.c: use parse_options APILibravatar Dave Borowitz1-104/+59
2015-08-19submodule: allow erroneous values for the fetchRecurseSubmodules optionLibravatar Heiko Voigt1-0/+1
2015-08-19submodule: use new config API for worktree configurationsLibravatar Heiko Voigt1-0/+1
2015-08-19am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexLibravatar Paul Tan1-13/+36
2015-08-17notes: teach git-notes about notes.<name>.mergeStrategy optionLibravatar Jacob Keller1-1/+13
2015-08-17notes: add notes.mergeStrategy option to select default strategyLibravatar Jacob Keller1-2/+17
2015-08-17notes: extract parse_notes_merge_strategy to notes-utilsLibravatar Jacob Keller1-11/+1
2015-08-17Merge branch 'mh/get-remote-group-fix'Libravatar Junio C Hamano1-8/+6
2015-08-17Merge branch 'kd/pull-rebase-autostash'Libravatar Junio C Hamano1-1/+5