summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mh/init-delete-refs-api'Junio C Hamano2015-08-0316-205/+371
|\
| * delete_ref(): use the usual convention for old_sha1Michael Haggerty2015-06-224-15/+14
| * cmd_update_ref(): make logic more straightforwardMichael Haggerty2015-06-221-3/+10
| * update_ref(): don't read old reference value before deleteMichael Haggerty2015-06-221-3/+3
| * check_branch_commit(): make first parameter constMichael Haggerty2015-06-221-1/+1
| * refs.h: add some parameter names to function declarationsMichael Haggerty2015-06-221-11/+11
| * refs: move the remaining ref module declarations to refs.hMichael Haggerty2015-06-2210-91/+109
| * initial_ref_transaction_commit(): check for ref D/F conflictsMichael Haggerty2015-06-221-0/+34
| * initial_ref_transaction_commit(): check for duplicate refsMichael Haggerty2015-06-221-0/+11
| * refs: remove some functions from the module's public interfaceMichael Haggerty2015-06-222-37/+24
| * initial_ref_transaction_commit(): function for initial ref creationMichael Haggerty2015-06-223-4/+75
| * repack_without_refs(): make function privateMichael Haggerty2015-06-222-12/+8
| * prune_refs(): use delete_refs()Michael Haggerty2015-06-221-8/+17
| * prune_remote(): use delete_refs()Michael Haggerty2015-06-221-9/+2
| * delete_refs(): bail early if the packed-refs file cannot be rewrittenMichael Haggerty2015-06-221-3/+22
| * delete_refs(): make error message more genericMichael Haggerty2015-06-221-1/+1
| * delete_refs(): new function for the refs APIMichael Haggerty2015-06-223-20/+27
| * delete_ref(): handle special case more explicitlyMichael Haggerty2015-06-221-2/+9
| * remove_branches(): remove temporaryMichael Haggerty2015-06-221-2/+1
| * delete_ref(): move declaration to refs.hMichael Haggerty2015-06-223-4/+13
* | Merge branch 'pt/pull-builtin'Junio C Hamano2015-08-0313-1/+992
|\ \
| * | pull: remove redirection to git-pull.shPaul Tan2015-06-183-8/+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-183-0/+18
| * | 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
| * | pull: implement skeletal builtin pullPaul Tan2015-06-154-0/+36
| * | argv-array: implement argv_array_pushv()Paul Tan2015-06-153-0/+10
| * | parse-options-cb: implement parse_opt_passthru_argv()Paul Tan2015-06-153-0/+29
| * | parse-options-cb: implement parse_opt_passthru()Paul Tan2015-06-153-0/+59
* | | Merge branch 'jk/pkt-log-pack'Junio C Hamano2015-08-035-17/+71
|\ \ \
| * | | pkt-line: support tracing verbatim pack contentsJeff King2015-06-165-16/+71
| * | | pkt-line: tighten sideband PACK check when tracingJeff King2015-06-151-1/+1
| * | | pkt-line: simplify starts_with checks in packet tracingJeff King2015-06-151-2/+1
| | |/ | |/|
* | | Merge branch 'mr/rebase-i-customize-insn-sheet'Junio C Hamano2015-08-034-3/+50
|\ \ \
| * | | git-rebase--interactive.sh: add config option for custom instruction formatMichael Rappazzo2015-06-154-3/+50
| | |/ | |/|
* | | Merge branch 'rl/send-email-aliases'Junio C Hamano2015-08-036-44/+333
|\ \ \
| * | | send-email: suppress meaningless whitespaces in from fieldRemi Lespinet2015-07-072-0/+25
| * | | send-email: allow multiple emails using --cc, --to and --bccRemi Lespinet2015-07-073-21/+52
| * | | send-email: consider quote as delimiter instead of characterRemi Lespinet2015-07-071-2/+4
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 00:10:58 +0100