summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* convert trivial sprintf / strcpy calls to xsnprintfJeff King2015-09-257-14/+16
* mailsplit: make PATH_MAX buffers dynamicJeff King2015-09-251-11/+23
* fsck: use strbuf to generate alternate directoriesJeff King2015-09-251-5/+6
* fsck: don't fsck alternates for connectivity-only checkJeff King2015-09-251-8/+9
* mailsplit: fix FILE* leak in split_maildirJeff King2015-09-251-1/+4
* show-branch: avoid segfault with --reflog of unborn branchJeff King2015-09-251-0/+2
* Merge branch 'ah/show-ref-usage-string'Junio C Hamano2015-09-141-1/+1
|\
| * show-ref: place angle brackets around variables in usage stringah/show-ref-usage-stringAlex Henrie2015-08-311-1/+1
* | Merge branch 'rt/help-strings-fix'Junio C Hamano2015-09-143-3/+3
|\ \
| * | tag, update-ref: improve description of option "create-reflog"rt/help-strings-fixRalf Thielow2015-09-112-2/+2
| * | pull: don't mark values for option "rebase" for translationRalf Thielow2015-09-111-1/+1
* | | Merge branch 'gb/apply-comment-typofix'Junio C Hamano2015-09-141-1/+1
* | | Sync with 2.5.2Junio C Hamano2015-09-091-2/+4
|\ \ \ | |/ / |/| |
| * | Sync with 2.4.9Junio C Hamano2015-09-041-2/+4
| |\ \
| | * \ Sync with 2.3.9Junio C Hamano2015-09-041-2/+4
| | |\ \
| | | * \ Sync with 2.2.3Junio C Hamano2015-09-041-2/+4
| | | |\ \
| | | | * | show-branch: use a strbuf for reflog descriptionsJeff King2015-09-041-2/+4
| * | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-031-3/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/calloc-pathspec' into maintJunio C Hamano2015-09-032-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/rev-list-has-no-notes' into maintJunio C Hamano2015-09-031-0/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mh/get-remote-group-fix' into maintJunio C Hamano2015-09-031-8/+6
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano2015-09-081-2/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | am: match --signoff to the original scripted versionjc/builtin-am-signoff-regression-fixJunio C Hamano2015-09-061-2/+29
* | | | | | | | | | Merge branch 'jk/am-rerere-lock-fix'Junio C Hamano2015-09-032-14/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fixJeff King2015-09-012-14/+9
* | | | | | | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-011-3/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | commit: don't rewrite shared index unnecessarilydt/commit-preserve-base-index-upon-opportunistic-cache-tree-updateDavid Turner2015-08-311-3/+1
| | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'jk/guess-repo-name-regression-fix' into maintJunio C Hamano2015-08-251-1/+2
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'ah/reflog-typofix-in-error'Junio C Hamano2015-09-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | reflog: add missing single quote to error messageah/reflog-typofix-in-errorAlex Henrie2015-08-281-1/+1
* | | | | | | | | | | | Merge branch 'ah/read-tree-usage-string'Junio C Hamano2015-09-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | read-tree: replace bracket set with parentheses to clarify usageah/read-tree-usage-stringAlex Henrie2015-08-281-1/+1
* | | | | | | | | | | | | Merge branch 'ah/pack-objects-usage-strings'Junio C Hamano2015-09-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | pack-objects: place angle brackets around placeholders in usage stringsah/pack-objects-usage-stringsAlex Henrie2015-08-281-2/+2
* | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
View Lorry Controller Status