summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-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
2013-06-24bash prompt: mention that PROMPT_COMMAND mode is fasterLibravatar SZEDER Gábor1-5/+5
2013-06-24bash prompt: avoid command substitution when finalizing gitstringLibravatar SZEDER Gábor1-1/+5
2013-06-24bash prompt: avoid command substitution when checking for untracked filesLibravatar SZEDER Gábor1-1/+1
2013-06-24bash prompt: use bash builtins to check stash stateLibravatar SZEDER Gábor2-2/+4
2013-06-24bash prompt: use bash builtins to check for unborn branch for dirty stateLibravatar SZEDER Gábor1-1/+1
2013-06-24bash prompt: combine 'git rev-parse' for detached headLibravatar SZEDER Gábor2-4/+20
2013-06-24bash prompt: combine 'git rev-parse' executions in the main code pathLibravatar SZEDER Gábor1-5/+13
2013-06-24bash prompt: use bash builtins to find out current branchLibravatar SZEDER Gábor1-18/+33
2013-06-24bash prompt: use bash builtins to find out rebase stateLibravatar SZEDER Gábor1-6/+6
2013-06-24bash prompt: run 'git rev-parse --git-dir' directly instead of __gitdir()Libravatar SZEDER Gábor2-27/+1
2013-06-24bash prompt: return early from __git_ps1() when not in a git repositoryLibravatar SZEDER Gábor1-100/+101
2013-06-24bash prompt: print unique detached HEAD abbreviated object nameLibravatar SZEDER Gábor2-2/+3
2013-06-24bash prompt: add a test for symbolic link symbolic refsLibravatar SZEDER Gábor1-0/+9
2013-06-24completion, bash prompt: move __gitdir() tests to completion test suiteLibravatar SZEDER Gábor2-128/+134
2013-06-24Revert "Merge branch 'jg/status-config'"Libravatar Junio C Hamano3-76/+0