aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'maint'Junio C Hamano2013-07-01
|\
| * t7500: fix flipped actual/expectAndrew Pimlott2013-07-01
| * lib-rebase: document exec_ in FAKE_LINESAndrew Pimlott2013-07-01
* | Merge branch 'rr/remote-branch-config-refresh'Junio C Hamano2013-07-01
|\ \
| * | t/t5505-remote: test multiple push/pull in remotes-fileRamkumar Ramachandra2013-06-23
| * | t/t5505-remote: test url-with-# in branches-fileRamkumar Ramachandra2013-06-23
| * | t/t5505-remote: use test_path_is_missingRamkumar Ramachandra2013-06-23
| * | t/t5505-remote: test push-refspec in branches-fileRamkumar Ramachandra2013-06-23
| * | t/t5505-remote: modernize styleRamkumar Ramachandra2013-06-23
* | | Merge branch 'ed/color-prompt'Junio C Hamano2013-07-01
|\ \ \
| * | | git-prompt.sh: do not print duplicate clean color codeEduardo R. D'Avila2013-06-26
| * | | t9903: remove redundant testsEduardo R. D'Avila2013-06-26
| * | | t9903: add tests for git-prompt pcmodeEduardo R. D'Avila2013-06-26
* | | | Merge branch 'ap/rebase-multiple-fixups'Junio C Hamano2013-07-01
|\ \ \ \
| * | | | lib-rebase: style: use write_script, <<-\EOFAndrew Pimlott2013-07-01
| * | | | rebase -i: handle fixup! fixup! in --autosquashAndrew Pimlott2013-06-27
* | | | | Merge branch 'kb/am-deprecate-resolved'Junio C Hamano2013-07-01
|\ \ \ \ \
| * | | | | am: replace uses of --resolved with --continueKevin Bracey2013-06-27
* | | | | | Merge branch 'sg/bash-prompt'Junio C Hamano2013-07-01
|\ \ \ \ \ \
| * | | | | | bash prompt: use bash builtins to check stash stateSZEDER Gábor2013-06-24
| * | | | | | bash prompt: combine 'git rev-parse' for detached headSZEDER Gábor2013-06-24
| * | | | | | bash prompt: print unique detached HEAD abbreviated object nameSZEDER Gábor2013-06-24
| * | | | | | bash prompt: add a test for symbolic link symbolic refsSZEDER Gábor2013-06-24
| * | | | | | completion, bash prompt: move __gitdir() tests to completion test suiteSZEDER Gábor2013-06-24
| * | | | | | bash prompt: use 'write_script' helper in interactive rebase testSZEDER Gábor2013-06-24
| * | | | | | bash prompt: fix redirection coding style in testsSZEDER Gábor2013-06-24
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'wk/doc-in-linux-3.x-era'Junio C Hamano2013-07-01
|\ \ \ \ \ \
| * | | | | | Documentation: Update 'linux-2.6.git' -> 'linux.git'W. Trevor King2013-06-22
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jc/topo-author-date-sort'Junio C Hamano2013-07-01
|\ \ \ \ \ \
| * | | | | | t6003: add --author-date-order testJunio C Hamano2013-06-21
| * | | | | | topology tests: teach a helper to set author dates as wellJunio C Hamano2013-06-21
| * | | | | | t6003: add --date-order testJunio C Hamano2013-06-21
| * | | | | | topology tests: teach a helper to take abbreviated timestampsJunio C Hamano2013-06-21
| * | | | | | t/lib-t6000: style fixesJunio C Hamano2013-06-21
| * | | | | | prio-queue: priority queue of pointers to structsJunio C Hamano2013-06-11
* | | | | | | Merge branch 'maint'Junio C Hamano2013-06-30
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | test: spell 'ls-files --delete' option correctly in test descriptionsSZEDER Gábor2013-06-30
| * | | | | | Merge branch 'nd/clone-connectivity-shortcut' (early part) into maintJunio C Hamano2013-06-28
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ks/difftool-dir-diff-copy-fix' into maintJunio C Hamano2013-06-27
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fc/show-branch-in-rebase-am' into maintJunio C Hamano2013-06-27
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rs/commit-m-no-edit' into maintJunio C Hamano2013-06-27
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/strbuf-branchname-fix' into maintJunio C Hamano2013-06-27
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mk/combine-diff-context-horizon-fix' into maintJunio C Hamano2013-06-27
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kb/ancestry-path-threedots' into maintJunio C Hamano2013-06-27
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/fetch-into-shallow' into maintJunio C Hamano2013-06-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-06-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/diff-ignore-blank-lines'Junio C Hamano2013-06-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | diff: add --ignore-blank-lines optionAntoine Pelisse2013-06-19
* | | | | | | | | | | | | | | | | Merge branch 'jk/submodule-subdirectory-ok'Junio C Hamano2013-06-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | submodule: drop the top-level requirementJohn Keeping2013-06-17