summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fixJeff King2015-09-015-16/+61
* Eighth batch for 2.6Junio C Hamano2015-08-311-0/+39
* Merge branch 'sg/describe-contains'Junio C Hamano2015-08-313-6/+14
|\
| * describe --contains: default to HEAD when no commit-ish is givensg/describe-containsSZEDER Gábor2015-08-253-6/+14
* | Merge branch 'db/push-sign-if-asked'Junio C Hamano2015-08-3114-152/+253
|\ \
| * | push: add a config option push.gpgSign for default signed pushesdb/push-sign-if-askedDave Borowitz2015-08-193-15/+70
| * | push: support signing pushes iff the server supports itDave Borowitz2015-08-1910-49/+128
| * | builtin/send-pack.c: use parse_options APIDave Borowitz2015-08-191-104/+59
| * | config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_...Dave Borowitz2015-08-192-3/+4
| * | transport: remove git_transport_options.push_certDave Borowitz2015-08-192-4/+0
| * | gitremote-helpers.txt: document pushcert optionDave Borowitz2015-08-191-0/+3
| * | Documentation/git-send-pack.txt: document --signedDave Borowitz2015-08-191-1/+9
| * | Documentation/git-send-pack.txt: wrap long synopsis lineDave Borowitz2015-08-191-1/+3
| * | Documentation/git-push.txt: document when --signed may failDave Borowitz2015-08-191-1/+3
* | | Merge branch 'jk/notes-merge-config'Junio C Hamano2015-08-318-25/+187
|\ \ \
| * | | notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-configJacob Keller2015-08-174-1/+64
| * | | notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-174-3/+76
| * | | notes: add tests for --commit/--abort/--strategy exclusivityJacob Keller2015-08-171-0/+12
| * | | notes: extract parse_notes_merge_strategy to notes-utilsJacob Keller2015-08-173-11/+20
| * | | notes: extract enum notes_merge_strategy to notes-utils.hJacob Keller2015-08-172-7/+11
| * | | notes: document cat_sort_uniq rewriteModeJacob Keller2015-08-172-4/+5
* | | | Merge branch 'jc/am-state-fix'Junio C Hamano2015-08-3110-44/+80
|\ \ \ \
| * | | | write_file(): drop caller-supplied LF from calls to create a one-liner filejc/am-state-fixJunio C Hamano2015-08-256-10/+10
| * | | | write_file_v(): do not leave incomplete line at the endJunio C Hamano2015-08-252-8/+3
| * | | | write_file(): drop "fatal" parameterJunio C Hamano2015-08-2410-19/+40
| * | | | 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/fix-alias-pager-config-key-warnings'Junio C Hamano2015-08-315-12/+43
|\ \ \ \ \ \
| * | | | | | config: silence warnings for command names with invalid keysjk/fix-alias-pager-config-key-warningsJeff King2015-08-245-12/+43
* | | | | | | Merge branch 'jk/rev-list-has-no-notes'Junio C Hamano2015-08-314-0/+9
|\ \ \ \ \ \ \
| * | | | | | | rev-list: make it obvious that we do not support notesjk/rev-list-has-no-notesJeff King2015-08-244-0/+9
* | | | | | | | Merge branch 'hv/submodule-config'Junio C Hamano2015-08-3112-98/+836
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule: allow erroneous values for the fetchRecurseSubmodules optionhv/submodule-configHeiko Voigt2015-08-196-17/+66
| * | | | | | | | submodule: use new config API for worktree configurationsHeiko Voigt2015-08-199-138/+104
| * | | | | | | | submodule: extract functions for config set and lookupHeiko Voigt2015-08-191-45/+97
| * | | | | | | | submodule: implement a config API for lookup of .gitmodules valuesHeiko Voigt2015-08-199-0/+671
* | | | | | | | | Merge branch 'sg/config-name-only'Junio C Hamano2015-08-314-60/+74
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
| * | | | | | | | | completion: list variable names reliably with 'git config --name-only'SZEDER Gábor2015-08-101-12/+3
| * | | | | | | | | config: add '--name-only' option to list only variable namesSZEDER Gábor2015-08-104-5/+42
* | | | | | | | | | Sync with 2.5.1Junio C Hamano2015-08-283-2/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Git 2.5.1v2.5.1Junio C Hamano2015-08-283-2/+19
View Lorry Controller Status