summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'es/worktree-add'Junio C Hamano2015-08-121-1/+1
|\
| * config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire"Eric Sunshine2015-07-201-1/+1
* | Merge branch 'jx/do-not-crash-receive-pack-wo-head'Junio C Hamano2015-08-031-1/+1
|\ \
| * | receive-pack: crash when checking with non-exist HEADjx/do-not-crash-receive-pack-wo-headJiang Xin2015-07-221-1/+1
* | | Merge branch 'db/send-pack-user-signingkey'Junio C Hamano2015-08-031-0/+3
|\ \ \
| * | | builtin/send-pack.c: respect user.signingkeydb/send-pack-user-signingkeyJunio C Hamano2015-07-211-0/+3
| * | | Merge branch 'mh/fsck-reflog-entries' into maintJunio C Hamano2015-07-151-14/+20
| |\ \ \
| * \ \ \ Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maintJunio C Hamano2015-07-151-6/+6
| |\ \ \ \
* | \ \ \ \ Merge branch 'dt/refs-backend-preamble'Junio C Hamano2015-08-034-17/+57
|\ \ \ \ \ \
| * | | | | | update-ref and tag: add --create-reflog argDavid Turner2015-07-212-4/+15
| * | | | | | git-reflog: add exists commandDavid Turner2015-07-211-1/+32
| * | | | | | refs: new public ref function: safe_create_reflogDavid Turner2015-07-211-9/+5
| * | | | | | refs.c: add err arguments to reflog functionsDavid Turner2015-07-211-3/+5
* | | | | | | Merge branch 'jk/date-mode-format'Junio C Hamano2015-08-035-11/+15
|\ \ \ \ \ \ \
| * | | | | | | introduce "format" date-modeJeff King2015-06-291-0/+3
| * | | | | | | convert "enum date_mode" into a structJeff King2015-06-296-14/+15
| * | | | | | | show-branch: use DATE_RELATIVE instead of magic numberJeff King2015-06-291-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'ib/scripted-parse-opt-better-hint-string'Junio C Hamano2015-08-031-27/+30
|\ \ \ \ \ \ \
| * | | | | | | rev-parse --parseopt: allow [*=?!] in argument hintsib/scripted-parse-opt-better-hint-stringIlya Bobyr2015-07-151-27/+30
| |/ / / / / /
* | | | | | | Merge branch 'dt/log-follow-config'Junio C Hamano2015-08-031-0/+16
|\ \ \ \ \ \ \
| * | | | | | | log: add "log.follow" configuration variableDavid Turner2015-07-091-0/+16
| |/ / / / / /
* | | | | | | Merge branch 'jk/cat-file-batch-all'Junio C Hamano2015-08-031-35/+97
|\ \ \ \ \ \ \
| * | | | | | | cat-file: sort and de-dup output of --batch-all-objectsjk/cat-file-batch-allJeff King2015-06-261-7/+15
| * | | | | | | cat-file: add --batch-all-objects optionJeff King2015-06-221-2/+42
| * | | | | | | cat-file: split batch_one_object into two stagesJeff King2015-06-221-16/+23
| * | | | | | | cat-file: stop returning value from batch_one_objectJeff King2015-06-221-12/+6
| * | | | | | | cat-file: add --buffer optionJeff King2015-06-221-7/+19
| * | | | | | | cat-file: move batch_options definition to top of fileJeff King2015-06-221-6/+7
| * | | | | | | cat-file: minor style fix in options listJeff King2015-06-221-1/+1
* | | | | | | | Merge branch 'js/fsck-opt'Junio C Hamano2015-08-034-36/+99
|\ \ \ \ \ \ \ \
| * | | | | | | | fsck: support ignoring objects in `git fsck` via fsck.skiplistjs/fsck-optJohannes Schindelin2015-06-231-0/+13
| * | | | | | | | fsck: git receive-pack: support excluding objects from fsck'ingJohannes Schindelin2015-06-231-0/+11
| * | | | | | | | fsck: introduce `git fsck --connectivity-only`Johannes Schindelin2015-06-231-1/+6
| * | | | | | | | fsck: support demoting errors to warningsJohannes Schindelin2015-06-231-0/+12
| * | | | | | | | fsck (receive-pack): allow demoting errors to warningsJohannes Schindelin2015-06-233-2/+24
| * | | | | | | | fsck: introduce identifiers for fsck messagesJohannes Schindelin2015-06-221-18/+8
| * | | | | | | | fsck: introduce fsck optionsJohannes Schindelin2015-06-223-15/+25
* | | | | | | | | Merge branch 'mh/init-delete-refs-api'Junio C Hamano2015-08-0310-48/+59
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | delete_ref(): use the usual convention for old_sha1mh/init-delete-refs-apiMichael Haggerty2015-06-222-2/+9
| * | | | | | | | | cmd_update_ref(): make logic more straightforwardMichael Haggerty2015-06-221-3/+10
| * | | | | | | | | check_branch_commit(): make first parameter constMichael Haggerty2015-06-221-1/+1
| * | | | | | | | | refs: move the remaining ref module declarations to refs.hMichael Haggerty2015-06-225-0/+5
| * | | | | | | | | initial_ref_transaction_commit(): function for initial ref creationMichael Haggerty2015-06-221-4/+14
| * | | | | | | | | prune_refs(): use delete_refs()Michael Haggerty2015-06-221-8/+17
| * | | | | | | | | prune_remote(): use delete_refs()Michael Haggerty2015-06-221-9/+2
| * | | | | | | | | delete_refs(): new function for the refs APIMichael Haggerty2015-06-221-20/+1
| * | | | | | | | | remove_branches(): remove temporaryMichael Haggerty2015-06-221-2/+1
* | | | | | | | | | Merge branch 'pt/pull-builtin'Junio C Hamano2015-08-031-0/+882
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pull: remove redirection to git-pull.shPaul Tan2015-06-181-7/+0
| * | | | | | | | | | pull --rebase: error on no merge candidate casesPaul Tan2015-06-181-3/+12
View Lorry Controller Status