difftool: handle unmerged files in dir-diff mode
[gitweb.git] / Documentation / gitignore.txt
2016-05-02 Merge branch 'ad/cygwin-wants-rename' into maint
2016-05-02 Merge branch 'jk/check-repository-format' into maint
2016-04-25 Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com...
2016-04-15 Merge branch 'jk/startup-info' into maint
2016-04-15 Merge branch 'gf/fetch-pack-direct-object-fetch' into...
2016-04-15 Merge branch 'jc/index-pack' into maint
2016-04-15 Merge branch 'cc/doc-recommend-performance-trace-to...
2016-04-15 Merge branch 'mm/lockfile-error-message' into maint
2016-03-24 Merge branch 'sb/submodule-module-list-pathspec-fix'
2016-03-23 Merge branch 'master' of git://github.com/git-l10n...
2016-03-21 Merge branch 'tb/avoid-gcc-on-darwin-10-6'
2016-03-21 Merge tag 'l10n-2.8.0-rnd3' of git://github.com/git...
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-18 Revert "Merge branch 'nd/exclusion-regression-fix'"
2016-03-18 Revert "Merge branch 'jc/exclusion-doc'"
2016-03-17 Sync with Git 2.7.4
2016-03-16 Sync with maint
2016-03-16 Merge branch 'jc/sane-grep'
2016-03-16 Merge branch 'cn/deprecate-ssh-git-url'
2016-03-14 Merge branch 'mg/wt-status-mismarked-i18n'
2016-03-12 Merge branch 'master' of git://github.com/git-l10n...
2016-03-10 Sync with 2.7.3
2016-03-10 Merge branch 'dt/initial-ref-xn-commit-doc' into maint
2016-03-10 Merge branch 'sb/submodule-module-list-fix' into maint
2016-03-10 Merge branch 'nd/git-common-dir-fix' into maint
2016-03-10 Merge branch 'jx/http-no-proxy'
2016-03-10 Merge branch 'jc/exclusion-doc'
2016-03-10 Merge branch 'js/close-packs-before-gc'
2016-03-10 Merge branch 'sb/rebase-summary'
2016-03-08 gitignore: document that unignoring a directory unignor...
2016-03-04 Merge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-03-04 Merge branch 'js/pthread-exit-emu-windows'
2016-03-04 Merge branch 'sb/submodule-parallel-fetch'
2016-03-04 Merge branch 'jk/tighten-alloc'
2016-03-04 Merge branch 'jk/pack-idx-corruption-safety'
2016-03-04 Merge branch 'js/mingw-tests'
2016-03-03 Merge branch 'jc/maint-index-pack-keep' into jc/index...
2016-02-26 Merge branch 'mm/readme-markdown'
2016-02-26 Merge branch 'ma/update-hooks-sample-typofix'
2016-02-26 Merge branch 'ls/makefile-cflags-developer-tweak'
2016-02-26 Merge branch 'dt/initial-ref-xn-commit-doc'
2016-02-26 Merge branch 'js/config-set-in-non-repository'
2016-02-26 Merge branch 'jk/epipe-in-async'
2016-02-26 Merge branch 'mm/push-default-warning'
2016-02-26 Merge branch 'fa/merge-recursive-no-rename'
2016-02-26 Merge branch 'sb/submodule-fetch-nontip'
2016-02-26 Merge branch 'sb/submodule-module-list-fix'
2016-02-26 Merge branch 'tb/conversion'
2016-02-26 Merge branch 'jk/grep-binary-workaround-in-test'
2016-02-26 Merge branch 'ps/plug-xdl-merge-leak'
2016-02-26 Merge branch 'mm/push-simple-doc'
2016-02-26 Merge branch 'jg/credential-cache-chdir-to-sockdir'
2016-02-26 Merge branch 'ps/config-error'
2016-02-26 Merge branch 'mg/work-tree-tests'
2016-02-26 Merge branch 'ls/config-origin'
2016-02-26 Merge branch 'jk/tighten-alloc'
2016-02-26 Merge branch 'jk/more-comments-on-textconv'
2016-02-26 Merge branch 'jk/no-diff-emit-common'
2016-02-26 Merge branch 'ak/git-strip-extension-from-dashed-command'
2016-02-26 Merge branch 'ak/extract-argv0-last-dir-sep'
2016-02-26 Merge branch 'kn/ref-filter-atom-parsing'
2016-02-26 Merge branch 'tg/git-remote'
2016-02-24 Merge branch 'jc/am-i-v-fix'
2016-02-24 Merge branch 'nd/worktree-add-B'
2016-02-24 Merge branch 'nd/exclusion-regression-fix'
2016-02-24 Merge branch 'ew/force-ipv4'
2016-02-24 Merge branch 'nd/git-common-dir-fix'
2016-02-22 Merge branch 'js/git-remote-add-url-insteadof-test'
2016-02-22 Merge branch 'jk/config-include'
2016-02-22 Merge branch 'ew/connect-verbose'
2016-02-22 Merge branch 'pw/completion-stash' into maint
2016-02-22 Merge branch 'dw/mergetool-vim-window-shuffle' into...
2016-02-22 Merge branch 'ah/stripspace-optstring' into maint
2016-02-22 Merge branch 'pw/completion-stash'
2016-02-17 Merge branch 'dw/mergetool-vim-window-shuffle'
2016-02-17 Merge branch 'ah/stripspace-optstring'
2016-02-17 Merge branch 'jk/rerere-xsnprintf'
2016-02-17 Merge branch 'da/user-useconfigonly'
2016-02-17 Merge branch 'mg/mingw-test-fix'
2016-02-17 Merge branch 'js/mingw-tests'
2016-02-17 Merge branch 'jk/drop-rsync-transport'
2016-02-17 Merge branch 'js/test-lib-windows-emulated-yes' into...
2016-02-17 Merge branch 'aw/push-force-with-lease-reporting' into...
2016-02-17 Merge branch 'nd/do-not-move-worktree-manually' into...
2016-02-15 dir.c: don't exclude whole dir prematurely
2016-02-10 Merge branch 'js/test-lib-windows-emulated-yes'
2016-02-10 Merge branch 'jk/options-cleanup'
2016-02-10 Merge branch 'aw/push-force-with-lease-reporting'
2016-02-10 Merge branch 'ls/clean-smudge-override-in-config'
2016-02-10 Merge branch 'ew/connect-verbose'
2016-02-10 Merge branch 'cc/untracked'
2016-02-10 Merge branch 'nd/do-not-move-worktree-manually'
2016-02-05 Merge branch 'ss/clone-depth-single-doc' into maint
2016-02-05 Merge branch 'sg/t6050-failing-editor-test-fix' into...
2016-02-05 Merge branch 'ew/for-each-ref-doc' into maint
2016-02-05 Merge branch 'ss/user-manual' into maint
2016-02-05 Merge branch 'jk/ref-cache-non-repository-optim' into...
2016-02-05 Merge branch 'pw/completion-stash' into maint
2016-02-05 Merge branch 'pw/completion-show-branch' into maint
2016-02-05 Merge branch 'jk/completion-rebase' into maint
next