apply: register conflicted stages to the index
[gitweb.git] / t /
2012-07-09 apply: register conflicted stages to the index
2012-07-09 apply: accept -3/--3way command line option
2012-05-07 Merge branch 'nh/empty-rebase'
2012-05-07 Merge branch 'zj/diff-empty-chmod'
2012-05-07 Merge branch 'jk/maint-tformat-with-z'
2012-05-07 Merge branch 'th/difftool-diffall'
2012-05-07 Sync with maint
2012-05-07 Merge branch 'jk/maint-gitweb-test-use-sane-perl' into...
2012-05-07 Merge branch 'js/daemon-test-race-fix' into maint
2012-05-07 Merge branch 'jk/maint-config-bogus-section' into maint
2012-05-07 Merge branch 'pw/t5800-import-race-fix' into maint
2012-05-07 Merge branch 'rt/cherry-revert-conflict-summary' into...
2012-05-07 Merge branch 'cb/maint-report-mount-point-correctly...
2012-05-03 Merge branch 'maint'
2012-05-03 Merge branch 'jc/merge-reduce-parents-early' into maint
2012-05-03 Merge branch 'cb/cherry-pick-rev-path-confusion' into...
2012-05-03 Merge branch 'cb/http-multi-curl-auth' into maint
2012-05-03 Merge branch 'mb/fetch-call-a-non-branch-a-ref' into...
2012-05-03 Merge branch 'rl/maint-stash-i18n-save-error' into...
2012-05-03 Merge branch 'jm/maint-strncpy-diff-no-index' into...
2012-05-03 Merge branch 'jk/maint-push-progress'
2012-05-03 Merge branch 'nd/columns'
2012-05-02 Merge branch 'master' of git://git.bogomips.org/git-svn
2012-05-02 Merge branch 'tr/xdiff-fast-hash'
2012-05-02 Merge branch 'jk/maint-gitweb-test-use-sane-perl'
2012-05-02 Merge branch 'pw/message-cleanup'
2012-05-02 Merge branch 'zj/diff-stat-smaller-num-columns'
2012-05-02 Merge branch 'pw/p4-various'
2012-05-02 Merge branch 'jc/rerere-train'
2012-05-02 Merge branch 'ab/i18n'
2012-05-02 Merge branch 'lp/diffstat-with-graph'
2012-05-02 Merge branch 'zj/mksh-columns-breakage'
2012-05-02 Merge branch 'jk/doc-asciidoc-inline-literal'
2012-05-02 Merge branch 'nd/i18n'
2012-05-02 Merge branch 'mm/simple-push'
2012-05-02 Merge branch 'jc/index-v4'
2012-05-02 t4006: Windows do not have /dev/zero
2012-05-02 diff --stat: report mode-only changes for binary files...
2012-05-02 Merge branch 'master' of https://github.com/git-l10n...
2012-05-02 Sync with v1.7.10.1
2012-05-02 Merge branch 'pw/fast-import-dataref-parsing' into...
2012-05-02 Merge branch 'it/fetch-pack-many-refs' into maint
2012-05-02 Merge branch 'jl/maint-submodule-recurse-fetch' into...
2012-05-02 Merge branch 'jc/maint-blame-minimal' into maint
2012-05-02 Merge branch 'lp/maint-diff-three-dash-with-graph'...
2012-05-02 Merge branch 'jk/rebase-i-submodule-conflict-only'...
2012-05-01 Merge l10n updates from branch 'maint' into master
2012-05-01 t/gitweb-lib: use $PERL_PATH to run gitweb
2012-05-01 tests: check --[short]stat output after chmod
2012-05-01 test: modernize style of t4006
2012-05-01 log-tree: the previous one is still not quite right
2012-05-01 log-tree: use custom line terminator in line terminatio...
2012-05-01 t5541: test more combinations of --progress
2012-04-30 git p4: submit files with wildcards
2012-04-30 git p4: fix writable file after rename or copy
2012-04-30 git p4: test submit
2012-04-30 git p4: bring back files in deleted client directory
2012-04-30 Merge branch 'ld/git-p4-tags-and-labels'
2012-04-30 Merge branch 'nh/empty-rebase'
2012-04-30 Merge branch 'jk/maint-config-bogus-section'
2012-04-30 diff --stat: use less columns for change counts
2012-04-30 Merge branch 'js/daemon-test-race-fix'
2012-04-30 Merge branch 'kk/gitweb-omit-expensive'
2012-04-30 Merge branch 'kk/maint-gitweb-missing-owner'
2012-04-30 Merge branch 'rs/commit-list-append'
2012-04-30 Merge branch 'mm/include-userpath'
2012-04-30 Merge branch 'pw/t5800-import-race-fix'
2012-04-30 Merge branch 'jk/repack-no-explode-objects-from-old...
2012-04-30 config: expand tildes in include.path variable
2012-04-30 Merge git://git.bogomips.org/git-svn
2012-04-28 Merge branch 'maint'
2012-04-28 Merge maint branch for tracking l10n updates of git...
2012-04-28 Merge master branch for tracking l10n updates of next...
2012-04-27 Merge branch 'jc/merge-reduce-parents-early'
2012-04-27 Merge branch 'js/fast-import-test-9300'
2012-04-27 Merge branch 'rt/cherry-revert-conflict-summary'
2012-04-27 Merge branch 'cb/maint-report-mount-point-correctly...
2012-04-27 Merge branch 'cb/cherry-pick-rev-path-confusion'
2012-04-27 Merge branch 'cb/http-multi-curl-auth'
2012-04-27 t4052: work around shells unable to set COLUMNS to 1
2012-04-27 Merge branch 'zj/mksh-columns-breakage' into lp/diffsta...
2012-04-27 tag: add --column
2012-04-27 status: add --column
2012-04-27 branch: add --column
2012-04-27 column: add dense layout support
2012-04-27 t9002: work around shells that are unable to set COLUMN...
2012-04-27 column: add columnar layout
2012-04-27 test-lib: skip test with COLUMNS=1 under mksh
2012-04-27 Add column layout skeleton and git-column
2012-04-27 t5570: fix forwarding of git-daemon messages via cat
2012-04-26 Merge branch 'rl/maint-stash-i18n-save-error'
2012-04-26 Merge branch 'mb/fetch-call-a-non-branch-a-ref'
2012-04-26 Merge branch 'jm/maint-strncpy-diff-no-index'
2012-04-26 Merge bundle error message fix in
2012-04-26 Merge branch 'jk/run-command-eacces' into maint
2012-04-26 Merge branch 'jc/push-upstream-sanity' into maint
2012-04-26 Merge branch 'jc/maint-clean-nested-worktree-in-subdir...
2012-04-26 Merge branch 'jk/diff-no-rename-empty' into maint
2012-04-26 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-26 Merge branch 'jc/commit-unedited-template' into maint
next