Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2013-07-01 |
|\ | |||
| * | t7500: fix flipped actual/expect | Andrew Pimlott | 2013-07-01 |
| * | lib-rebase: document exec_ in FAKE_LINES | Andrew Pimlott | 2013-07-01 |
* | | Merge branch 'rr/remote-branch-config-refresh' | Junio C Hamano | 2013-07-01 |
|\ \ | |||
| * | | t/t5505-remote: test multiple push/pull in remotes-file | Ramkumar Ramachandra | 2013-06-23 |
| * | | t/t5505-remote: test url-with-# in branches-file | Ramkumar Ramachandra | 2013-06-23 |
| * | | t/t5505-remote: use test_path_is_missing | Ramkumar Ramachandra | 2013-06-23 |
| * | | t/t5505-remote: test push-refspec in branches-file | Ramkumar Ramachandra | 2013-06-23 |
| * | | t/t5505-remote: modernize style | Ramkumar Ramachandra | 2013-06-23 |
* | | | Merge branch 'ed/color-prompt' | Junio C Hamano | 2013-07-01 |
|\ \ \ | |||
| * | | | git-prompt.sh: do not print duplicate clean color code | Eduardo R. D'Avila | 2013-06-26 |
| * | | | t9903: remove redundant tests | Eduardo R. D'Avila | 2013-06-26 |
| * | | | t9903: add tests for git-prompt pcmode | Eduardo R. D'Avila | 2013-06-26 |
* | | | | Merge branch 'ap/rebase-multiple-fixups' | Junio C Hamano | 2013-07-01 |
|\ \ \ \ | |||
| * | | | | lib-rebase: style: use write_script, <<-\EOF | Andrew Pimlott | 2013-07-01 |
| * | | | | rebase -i: handle fixup! fixup! in --autosquash | Andrew Pimlott | 2013-06-27 |
* | | | | | Merge branch 'kb/am-deprecate-resolved' | Junio C Hamano | 2013-07-01 |
|\ \ \ \ \ | |||
| * | | | | | am: replace uses of --resolved with --continue | Kevin Bracey | 2013-06-27 |
* | | | | | | Merge branch 'sg/bash-prompt' | Junio C Hamano | 2013-07-01 |
|\ \ \ \ \ \ | |||
| * | | | | | | bash prompt: use bash builtins to check stash state | SZEDER Gábor | 2013-06-24 |
| * | | | | | | bash prompt: combine 'git rev-parse' for detached head | SZEDER Gábor | 2013-06-24 |
| * | | | | | | bash prompt: print unique detached HEAD abbreviated object name | SZEDER Gábor | 2013-06-24 |
| * | | | | | | bash prompt: add a test for symbolic link symbolic refs | SZEDER Gábor | 2013-06-24 |
| * | | | | | | completion, bash prompt: move __gitdir() tests to completion test suite | SZEDER Gábor | 2013-06-24 |
| * | | | | | | bash prompt: use 'write_script' helper in interactive rebase test | SZEDER Gábor | 2013-06-24 |
| * | | | | | | bash prompt: fix redirection coding style in tests | SZEDER Gábor | 2013-06-24 |
| | |_|/ / / | |/| | | | | |||
* | | | | | | Merge branch 'wk/doc-in-linux-3.x-era' | Junio C Hamano | 2013-07-01 |
|\ \ \ \ \ \ | |||
| * | | | | | | Documentation: Update 'linux-2.6.git' -> 'linux.git' | W. Trevor King | 2013-06-22 |
| | |_|_|/ / | |/| | | | | |||
* | | | | | | Merge branch 'jc/topo-author-date-sort' | Junio C Hamano | 2013-07-01 |
|\ \ \ \ \ \ | |||
| * | | | | | | t6003: add --author-date-order test | Junio C Hamano | 2013-06-21 |
| * | | | | | | topology tests: teach a helper to set author dates as well | Junio C Hamano | 2013-06-21 |
| * | | | | | | t6003: add --date-order test | Junio C Hamano | 2013-06-21 |
| * | | | | | | topology tests: teach a helper to take abbreviated timestamps | Junio C Hamano | 2013-06-21 |
| * | | | | | | t/lib-t6000: style fixes | Junio C Hamano | 2013-06-21 |
| * | | | | | | prio-queue: priority queue of pointers to structs | Junio C Hamano | 2013-06-11 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-06-30 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||
| * | | | | | | test: spell 'ls-files --delete' option correctly in test descriptions | SZEDER Gábor | 2013-06-30 |
| * | | | | | | Merge branch 'nd/clone-connectivity-shortcut' (early part) into maint | Junio C Hamano | 2013-06-28 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'ks/difftool-dir-diff-copy-fix' into maint | Junio C Hamano | 2013-06-27 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'fc/show-branch-in-rebase-am' into maint | Junio C Hamano | 2013-06-27 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'rs/commit-m-no-edit' into maint | Junio C Hamano | 2013-06-27 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/strbuf-branchname-fix' into maint | Junio C Hamano | 2013-06-27 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'mk/combine-diff-context-horizon-fix' into maint | Junio C Hamano | 2013-06-27 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kb/ancestry-path-threedots' into maint | Junio C Hamano | 2013-06-27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/fetch-into-shallow' into maint | Junio C Hamano | 2013-06-27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jh/checkout-auto-tracking' into maint | Junio C Hamano | 2013-06-27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ap/diff-ignore-blank-lines' | Junio C Hamano | 2013-06-30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | diff: add --ignore-blank-lines option | Antoine Pelisse | 2013-06-19 |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/submodule-subdirectory-ok' | Junio C Hamano | 2013-06-30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | submodule: drop the top-level requirement | John Keeping | 2013-06-17 |