summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* gitweb: allow extra breadcrumbs to prefix the trailtf/gitweb-extra-breadcrumbsTony Finch2013-07-042-3/+26
* Merge branch 'maint'Junio C Hamano2013-07-012-3/+5
|\
| * t7500: fix flipped actual/expectAndrew Pimlott2013-07-011-3/+3
| * lib-rebase: document exec_ in FAKE_LINESAndrew Pimlott2013-07-011-0/+2
* | Update draft release notes to 1.8.4Junio C Hamano2013-07-011-0/+16
* | Merge branch 'rr/remote-branch-config-refresh'Junio C Hamano2013-07-013-402/+480
|\ \
| * | t/t5505-remote: test multiple push/pull in remotes-fileRamkumar Ramachandra2013-06-231-2/+14
| * | ls-remote doc: don't encourage use of branches-fileRamkumar Ramachandra2013-06-231-2/+2
| * | ls-remote doc: rewrite <repository> paragraphRamkumar Ramachandra2013-06-231-3/+3
| * | ls-remote doc: fix example invocation on git.gitRamkumar Ramachandra2013-06-231-1/+0
| * | t/t5505-remote: test url-with-# in branches-fileRamkumar Ramachandra2013-06-231-4/+18
| * | remote: remove dead code in read_branches_file()Ramkumar Ramachandra2013-06-231-19/+4
| * | t/t5505-remote: use test_path_is_missingRamkumar Ramachandra2013-06-231-2/+2
| * | t/t5505-remote: test push-refspec in branches-fileRamkumar Ramachandra2013-06-231-1/+2
| * | t/t5505-remote: modernize styleRamkumar Ramachandra2013-06-231-373/+440
* | | Merge branch 'ed/color-prompt'Junio C Hamano2013-07-012-70/+182
|\ \ \
| * | | git-prompt.sh: add missing information in commentsEduardo R. D'Avila2013-06-261-11/+15
| * | | git-prompt.sh: do not print duplicate clean color codeEduardo R. D'Avila2013-06-262-5/+5
| * | | t9903: remove redundant testsEduardo R. D'Avila2013-06-261-114/+1
| * | | git-prompt.sh: refactor colored prompt codeEduardo R. D'Avila2013-06-261-59/+26
| * | | t9903: add tests for git-prompt pcmodeEduardo R. D'Avila2013-06-261-0/+254
* | | | Merge branch 'ap/rebase-multiple-fixups'Junio C Hamano2013-07-014-44/+130
|\ \ \ \
| * | | | lib-rebase: style: use write_script, <<-\EOFap/rebase-multiple-fixupsAndrew Pimlott2013-07-011-38/+36
| * | | | rebase -i: handle fixup! fixup! in --autosquashAndrew Pimlott2013-06-274-6/+94
* | | | | Merge branch 'kb/am-deprecate-resolved'Junio C Hamano2013-07-015-10/+10
|\ \ \ \ \
| * | | | | am: replace uses of --resolved with --continueKevin Bracey2013-06-275-10/+10
* | | | | | Merge branch 'rr/column-doc'Junio C Hamano2013-07-011-3/+17
|\ \ \ \ \ \
| * | | | | | column doc: rewrite documentation for column.uiRamkumar Ramachandra2013-06-261-3/+17
* | | | | | | Merge branch 'ft/doc-git-transport'Junio C Hamano2013-07-011-0/+3
|\ \ \ \ \ \ \
| * | | | | | | documentation: add git:// transport security noticeFraser Tweedale2013-06-261-0/+3
| |/ / / / / /
* | | | | | | Merge branch 'sb/mailmap-merijn-brand'Junio C Hamano2013-07-011-0/+1
|\ \ \ \ \ \ \
| * | | | | | | .mailmap: Map "H.Merijn Brand" to "H. Merijn Brand"Stefan Beller2013-06-251-0/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'sg/bash-prompt'Junio C Hamano2013-07-014-333/+367
|\ \ \ \ \ \ \
| * | | | | | | bash prompt: mention that PROMPT_COMMAND mode is fasterSZEDER Gábor2013-06-241-5/+5
| * | | | | | | bash prompt: avoid command substitution when finalizing gitstringSZEDER Gábor2013-06-241-1/+5
| * | | | | | | bash prompt: avoid command substitution when checking for untracked filesSZEDER Gábor2013-06-241-1/+1
| * | | | | | | bash prompt: use bash builtins to check stash stateSZEDER Gábor2013-06-242-2/+4
| * | | | | | | bash prompt: use bash builtins to check for unborn branch for dirty stateSZEDER Gábor2013-06-241-1/+1
| * | | | | | | bash prompt: combine 'git rev-parse' for detached headSZEDER Gábor2013-06-242-4/+20
| * | | | | | | bash prompt: combine 'git rev-parse' executions in the main code pathSZEDER Gábor2013-06-241-5/+13
| * | | | | | | bash prompt: use bash builtins to find out current branchSZEDER Gábor2013-06-241-18/+33
| * | | | | | | bash prompt: use bash builtins to find out rebase stateSZEDER Gábor2013-06-241-6/+6
| * | | | | | | bash prompt: run 'git rev-parse --git-dir' directly instead of __gitdir()SZEDER Gábor2013-06-242-27/+1
| * | | | | | | bash prompt: return early from __git_ps1() when not in a git repositorySZEDER Gábor2013-06-241-100/+101
| * | | | | | | bash prompt: print unique detached HEAD abbreviated object nameSZEDER Gábor2013-06-242-2/+3
| * | | | | | | bash prompt: add a test for symbolic link symbolic refsSZEDER Gábor2013-06-241-0/+9
| * | | | | | | completion, bash prompt: move __gitdir() tests to completion test suiteSZEDER Gábor2013-06-242-128/+134
| * | | | | | | bash prompt: use 'write_script' helper in interactive rebase testSZEDER Gábor2013-06-241-7/+5
| * | | | | | | bash prompt: fix redirection coding style in testsSZEDER Gábor2013-06-241-116/+116
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'wk/doc-in-linux-3.x-era'Junio C Hamano2013-07-016-41/+47
|\ \ \ \ \ \ \
View Lorry Controller Status