summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 contentsjk/pkt-log-packJeff 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 formatmr/rebase-i-customize-insn-sheetMichael 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 fieldrl/send-email-aliasesRemi 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
| * | | send-email: reduce dependencies impact on parse_address_lineRemi Lespinet2015-07-074-1/+162
| * | | send-email: minor code refactoringRemi Lespinet2015-06-301-3/+3
| * | | send-email: allow use of aliases in the From field of --compose modeRemi Lespinet2015-06-301-2/+2
| * | | send-email: refactor address list processRemi Lespinet2015-06-301-10/+12
| * | | t9001-send-email: refactor header variable fields replacementRemi Lespinet2015-06-301-4/+7
| * | | send-email: allow aliases in patch header and command script outputsRemi Lespinet2015-06-302-0/+62
| * | | t9001-send-email: move script creation in a setup testRemi Lespinet2015-06-301-6/+9
| |/ /
* | | Merge branch 'kb/i18n-doc'Junio C Hamano2015-08-031-10/+23
|\ \ \
| * | | Documentation/i18n.txt: clarify character encoding supportkb/i18n-docKarsten Blees2015-07-011-10/+23
| | |/ | |/|
* | | Merge branch 'nd/export-worktree'Junio C Hamano2015-08-032-0/+19
|\ \ \
| * | | setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIRnd/export-worktreeNguyễn Thái Ngọc Duy2015-06-262-0/+19
* | | | Merge branch 'ee/clean-remove-dirs'Junio C Hamano2015-08-035-25/+277
|\ \ \ \
| * | | | read_gitfile_gently: fix use-after-freeJeff King2015-06-261-9/+5
| * | | | clean: improve performance when removing lots of directoriesErik Elfström2015-06-152-10/+30
| * | | | p7300: add performance tests for cleanErik Elfström2015-06-151-0/+31
| * | | | t7300: add tests to document behavior of clean and nested gitErik Elfström2015-06-151-0/+142
| * | | | setup: sanity check file size in read_gitfile_gentlyErik Elfström2015-06-152-0/+8
| * | | | setup: add gentle version of read_gitfileErik Elfström2015-06-092-20/+75
| | |_|/ | |/| |
* | | | Merge branch 'cb/parse-magnitude'Junio C Hamano2015-08-036-27/+76
|\ \ \ \
| * | | | parse-options: move unsigned long option parsing out of pack-objects.ccb/parse-magnitudeCharles Bailey2015-06-226-26/+73
View Lorry Controller Status