summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | | | | | | | | | | | lockfile: add accessor get_lock_file_path()Michael Haggerty2015-08-101-7/+8
* | | | | | | | | | | | | | | | | | Merge branch 'pt/am-builtin-options'Junio C Hamano2015-08-251-6/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am: let --signoff override --no-signoffpt/am-builtin-optionsPaul Tan2015-08-121-3/+25
| * | | | | | | | | | | | | | | | | am: let command-line options override saved optionsPaul Tan2015-08-121-4/+12
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'dt/notes-multiple'Junio C Hamano2015-08-251-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | notes: handle multiple worktreesdt/notes-multipleDavid Turner2015-08-111-0/+6
* | | | | | | | | | | | | | | | | Merge branch 'jk/git-path'Junio C Hamano2015-08-199-69/+84
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | memoize common git-path "constant" filesjk/git-pathJeff King2015-08-105-38/+37
| * | | | | | | | | | | | | | | | | get_repo_path: refactor path-allocationJeff King2015-08-101-14/+29
| * | | | | | | | | | | | | | | | | remote.c: drop extraneous local variable from migrate_fileJeff King2015-08-101-5/+2
View Lorry Controller Status