summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sg/describe-contains'Junio C Hamano2015-08-311-4/+4
|\
| * describe --contains: default to HEAD when no commit-ish is givensg/describe-containsSZEDER Gábor2015-08-251-4/+4
* | Merge branch 'db/push-sign-if-asked'Junio C Hamano2015-08-312-106/+128
|\ \
| * | push: add a config option push.gpgSign for default signed pushesdb/push-sign-if-askedDave Borowitz2015-08-192-15/+62
| * | push: support signing pushes iff the server supports itDave Borowitz2015-08-192-3/+23
| * | builtin/send-pack.c: use parse_options APIDave Borowitz2015-08-191-104/+59
* | | Merge branch 'jk/notes-merge-config'Junio C Hamano2015-08-311-13/+30
|\ \ \
| * | | notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-configJacob Keller2015-08-171-1/+13
| * | | notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-171-2/+17
| * | | notes: extract parse_notes_merge_strategy to notes-utilsJacob Keller2015-08-171-11/+1
* | | | Merge branch 'jc/am-state-fix'Junio C Hamano2015-08-314-34/+48
|\ \ \ \
| * | | | write_file(): drop caller-supplied LF from calls to create a one-liner filejc/am-state-fixJunio C Hamano2015-08-252-6/+6
| * | | | write_file_v(): do not leave incomplete line at the endJunio C Hamano2015-08-251-8/+2
| * | | | write_file(): drop "fatal" parameterJunio C Hamano2015-08-244-9/+9
| * | | | builtin/am: make sure state files are textJunio C Hamano2015-08-241-2/+8
| * | | | builtin/am: introduce write_state_*() helper functionsJunio C Hamano2015-08-241-27/+41
* | | | | Merge branch 'jc/log-p-cc'Junio C Hamano2015-08-311-9/+16
|\ \ \ \ \
| * | | | | builtin/log.c: minor reformatjc/log-p-ccJunio C Hamano2015-08-251-4/+2
| * | | | | log: show merge commit when --cc is givenJunio C Hamano2015-08-201-0/+4
| * | | | | log: when --cc is given, default to -p unless told otherwiseJunio C Hamano2015-08-201-0/+4
| * | | | | log: rename "tweak" helpersJunio C Hamano2015-08-201-5/+6
* | | | | | Merge branch 'jk/rev-list-has-no-notes'Junio C Hamano2015-08-311-0/+3
|\ \ \ \ \ \
| * | | | | | rev-list: make it obvious that we do not support notesjk/rev-list-has-no-notesJeff King2015-08-241-0/+3
| * | | | | | Merge branch 'sb/remove-unused-var-from-builtin-add' into maintJunio C Hamano2015-08-191-2/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ib/scripted-parse-opt-better-hint-string' into maintJunio C Hamano2015-08-191-27/+30
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'db/send-pack-user-signingkey' into maintJunio C Hamano2015-08-191-0/+3
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maintJunio C Hamano2015-08-191-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'hv/submodule-config'Junio C Hamano2015-08-312-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule: allow erroneous values for the fetchRecurseSubmodules optionhv/submodule-configHeiko Voigt2015-08-191-0/+1
| * | | | | | | | | submodule: use new config API for worktree configurationsHeiko Voigt2015-08-191-0/+1
* | | | | | | | | | Merge branch 'sg/config-name-only'Junio C Hamano2015-08-311-45/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | get_urlmatch: avoid useless strbuf writesg/config-name-onlyJeff King2015-08-201-4/+1
| * | | | | | | | | | format_config: simplify buffer handlingJeff King2015-08-201-22/+16
| * | | | | | | | | | format_config: don't init strbufJeff King2015-08-201-2/+1
| * | | | | | | | | | config: restructure format_config() for better control flowSZEDER Gábor2015-08-201-41/+37
| * | | | | | | | | | config: add '--name-only' option to list only variable namesSZEDER Gábor2015-08-101-2/+12
* | | | | | | | | | | Merge branch 'jc/calloc-pathspec'Junio C Hamano2015-08-262-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ps_matched: xcalloc() takes nmemb and then element sizejc/calloc-pathspecJunio C Hamano2015-08-202-2/+2
| * | | | | | | | | | | Merge branch 'ss/clone-guess-dir-name-simplify' into maintJunio C Hamano2015-08-031-13/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano2015-08-031-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/hint-rev-list-count' into maintJunio C Hamano2015-07-271-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maintJunio C Hamano2015-07-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/index-pack-reduce-recheck' into maintJunio C Hamano2015-07-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/am-builtin'Junio C Hamano2015-08-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | i18n: am: fix typo in description of -b optionJiang Xin2015-08-261-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'pt/am-builtin-abort-fix'Junio C Hamano2015-08-261-13/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexpt/am-builtin-abort-fixPaul Tan2015-08-191-13/+36
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'mh/tempfile'Junio C Hamano2015-08-254-29/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | gc: use tempfile module to handle gc.pid fileMichael Haggerty2015-08-121-20/+5
| * | | | | | | | | | | | | | | | | | lock_repo_for_gc(): compute the path to "gc.pid" only onceMichael Haggerty2015-08-121-3/+6
View Lorry Controller Status