summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | pull --rebase: exit early when the working directory is dirtyPaul Tan2015-06-181-1/+76
| * | | | | pull: configure --rebase via branch.<name>.rebase or pull.rebasePaul Tan2015-06-181-1/+34
| * | | | | pull: teach git pull about --rebasePaul Tan2015-06-181-2/+245
| * | | | | pull: set reflog messagePaul Tan2015-06-181-0/+22
| * | | | | pull: implement pulling into an unborn branchPaul Tan2015-06-181-1/+28
| * | | | | pull: fast-forward working tree if head is updatedPaul Tan2015-06-181-0/+30
| * | | | | pull: check if in unresolved merge statePaul Tan2015-06-181-0/+9
| * | | | | pull: support pull.ff configPaul Tan2015-06-181-0/+29
| * | | | | pull: error on no merge candidatesPaul Tan2015-06-181-0/+113
| * | | | | pull: pass git-fetch's options to git-fetchPaul Tan2015-06-181-0/+95
| * | | | | pull: pass git-merge's options to git-mergePaul Tan2015-06-151-0/+75
| * | | | | pull: pass verbosity, --progress flags to fetch and mergePaul Tan2015-06-151-0/+36
| * | | | | pull: implement fetch + mergePaul Tan2015-06-151-1/+61
View Lorry Controller Status