summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2013-06-27Merge branch 'bc/http-keep-memory-given-to-curl'Libravatar Junio C Hamano1-3/+9
2013-06-27Merge branch 'bc/checkout-tracking-name-plug-leak'Libravatar Junio C Hamano2-4/+7
2013-06-27Merge branch 'rr/rebase-stash-store'Libravatar Junio C Hamano4-17/+74
2013-06-27rebase -i: handle fixup! fixup! in --autosquashLibravatar Andrew Pimlott4-6/+94
2013-06-27am: replace uses of --resolved with --continueLibravatar Kevin Bracey5-10/+10
2013-06-26Update draft release notes to 1.8.4Libravatar Junio C Hamano1-0/+12
2013-06-26Merge branch 'tr/maint-apply-non-git-patch-parsefix'Libravatar Junio C Hamano2-1/+15
2013-06-26Merge branch 'ys/cygstart'Libravatar Junio C Hamano2-3/+9
2013-06-26Merge branch 'wk/doc-git-has-grown'Libravatar Junio C Hamano1-3/+3
2013-06-26Merge branch 'vl/typofix'Libravatar Junio C Hamano3-3/+3
2013-06-26Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'Libravatar Junio C Hamano9-21/+20
2013-06-26Merge branch 'mm/merge-in-dirty-worktree-doc'Libravatar Junio C Hamano1-2/+2
2013-06-26Merge branch 'kb/diff-blob-blob-doc'Libravatar Junio C Hamano1-7/+7
2013-06-26Merge branch 'mm/push-force-is-dangerous'Libravatar Junio C Hamano1-0/+9
2013-06-26Merge branch 'fg/submodule-non-ascii-path'Libravatar Junio C Hamano2-1/+17
2013-06-26documentation: add git:// transport security noticeLibravatar Fraser Tweedale1-0/+3
2013-06-26git-prompt.sh: add missing information in commentsLibravatar Eduardo R. D'Avila1-11/+15
2013-06-26git-prompt.sh: do not print duplicate clean color codeLibravatar Eduardo R. D'Avila2-5/+5
2013-06-26t9903: remove redundant testsLibravatar Eduardo R. D'Avila1-114/+1
2013-06-26git-prompt.sh: refactor colored prompt codeLibravatar Eduardo R. D'Avila1-59/+26
2013-06-26t9903: add tests for git-prompt pcmodeLibravatar Eduardo R. D'Avila1-0/+254
2013-06-26pretty: --format output should honor logOutputEncodingLibravatar Alexey Shumkin9-28/+35
2013-06-26pretty: Add failing tests: --format output should honor logOutputEncodingLibravatar Alexey Shumkin4-97/+199
2013-06-26t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputsLibravatar Alexey Shumkin1-22/+26
2013-06-26t7102 (reset): don't hardcode SHA-1 in expected outputsLibravatar Alexey Shumkin1-3/+5
2013-06-26t6006 (rev-list-format): don't hardcode SHA-1 in expected outputsLibravatar Alexey Shumkin1-63/+77
2013-06-26column doc: rewrite documentation for column.uiLibravatar Ramkumar Ramachandra1-3/+17
2013-06-25.mailmap: Map "H.Merijn Brand" to "H. Merijn Brand"Libravatar Stefan Beller1-0/+1
2013-06-25diff: demote core.safecrlf=true to core.safecrlf=warnLibravatar Junio C Hamano2-1/+17
2013-06-24Update draft release notes to 1.8.4Libravatar Junio C Hamano1-4/+14
2013-06-24Merge branch 'rr/am-quit-empty-then-abort-fix'Libravatar Junio C Hamano2-17/+40
2013-06-24Merge branch 'rt/cherry-pick-continue-advice-in-status'Libravatar Junio C Hamano2-4/+8
2013-06-24Merge branch 'nk/config-local-doc'Libravatar Junio C Hamano1-0/+9
2013-06-24Merge branch 'jk/mergetool-lib-refactor'Libravatar Junio C Hamano1-47/+35
2013-06-24Merge branch 'jk/doc-build-move-infordir-def'Libravatar Junio C Hamano1-22/+22
2013-06-24Merge branch 'fg/submodule-fixup'Libravatar Junio C Hamano1-2/+2
2013-06-24Merge branch 'dk/version-gen-gitdir'Libravatar Junio C Hamano1-1/+1
2013-06-24Merge branch 'dk/maint-t5150-dirname'Libravatar Junio C Hamano1-1/+1
2013-06-24Merge branch 'rs/unpack-trees-tree-walk-conflict-field'Libravatar Junio C Hamano2-16/+4
2013-06-24Merge branch 'rr/rebase-sha1-by-string-query'Libravatar Junio C Hamano4-2/+36
2013-06-24Merge branch 'mm/rm-coalesce-errors'Libravatar Junio C Hamano5-19/+184
2013-06-24Merge branch 'jh/libify-note-handling'Libravatar Junio C Hamano8-189/+203
2013-06-24Merge branch 'fc/sequencer-plug-leak'Libravatar Junio C Hamano1-7/+11
2013-06-24status/commit: make sure --porcelain is not affected by user-facing configLibravatar Junio C Hamano3-22/+61
2013-06-24commit: make it work with status.shortLibravatar Ramkumar Ramachandra1-0/+1
2013-06-24status: introduce status.branch to enable --branch by defaultLibravatar Jorge Juan Garcia Garcia3-0/+35
2013-06-24status: introduce status.short to enable --short by defaultLibravatar Jorge Juan Garcia Garcia3-0/+41
2013-06-24t/t5528-push-default: test pushdefault workflowsLibravatar Ramkumar Ramachandra1-0/+57
2013-06-24t/t5528-push-default: generalize test_push_*Libravatar Ramkumar Ramachandra1-2/+4
2013-06-24push: change `simple` to accommodate triangular workflowsLibravatar Ramkumar Ramachandra2-15/+38