merge-recursive: Fix modify/delete resolution in the recursive case
[gitweb.git] / builtin / log.c
2011-04-01 Merge branch 'jh/maint-do-not-track-non-branches' into...
2011-04-01 Merge branch 'fk/maint-cvsimport-early-failure' into...
2011-04-01 Merge branch 'jc/maint-apply-report-offset' into maint
2011-04-01 Merge branch 'jc/maint-apply-no-double-patch' into...
2011-04-01 Merge branch 'js/checkout-untracked-symlink' into maint
2011-04-01 Merge "checkout ambiguous ref bugfix" into maint
2011-04-01 reflog: fix overriding of command line options
2011-04-01 builtin/log.c: separate default and setup of cmd_log_init()
2011-03-31 Merge branch 'maint'
2011-03-30 Merge branch 'maint'
2011-03-30 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
2011-03-29 Merge branch 'maint'
2011-03-29 Merge branch 'jc/fetch-progressive-stride'
2011-03-29 Merge branches 'sp/maint-fetch-pack-stop-early' and...
2011-03-28 Merge branch 'maint'
2011-03-27 Merge branch 'mg/rev-list-n-parents'
2011-03-27 Merge branch 'jc/index-update-if-able'
2011-03-27 Merge branch 'jc/maint-rerere-in-workdir'
2011-03-27 Merge branch 'nd/index-doc'
2011-03-27 Merge branch 'jc/fetch-progressive-stride'
2011-03-26 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
2011-03-26 Merge git-gui 0.14.0
2011-03-26 Sync with 1.7.4.2
2011-03-23 Merge branch 'kc/gitweb-pathinfo-w-anchor'
2011-03-23 Merge branch 'jn/fortify-source-workaround'
2011-03-23 Merge branch 'jn/maint-c99-format'
2011-03-23 Merge branch 'lt/default-abbrev'
2011-03-23 Merge branch 'pk/stash-apply-status-relative'
2011-03-23 Merge branch 'jc/maint-diff-q-filter'
2011-03-23 Merge branch 'pw/p4'
2011-03-23 revision.c: introduce --min-parents and --max-parents...
2011-03-23 Merge branch 'mg/rev-list-one-side-only'
2011-03-23 Merge branch 'js/maint-stash-index-copy'
2011-03-23 Merge branch 'tl/p4'
2011-03-23 Merge branch 'mg/doc-bisect-tweak-worktree'
2011-03-23 Merge branch 'jn/test-sanitize-git-env'
2011-03-23 Merge branch 'sp/maint-upload-pack-stop-early'
2011-03-23 Merge branch 'sp/maint-fetch-pack-stop-early'
2011-03-23 Merge branch 'jc/maint-rev-list-culled-boundary'
2011-03-23 Merge branch 'jc/maint-fetch-alt'
2011-03-23 Merge branch 'sg/complete-symmetric-diff'
2011-03-23 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
2011-03-22 Merge branch 'maint'
2011-03-22 diffcore-rename: fall back to -C when -C -C busts the...
2011-03-21 Merge branch 'maint'
2011-03-21 Merge branch 'sp/maint-fd-limit' into maint
2011-03-21 Merge branch 'mr/hpux' into maint
2011-03-21 Merge branch 'so/submodule-no-update-first-time' into...
2011-03-21 Merge branch 'mo/perl-bidi-pipe-envfix' into maint
2011-03-21 Merge branch 'ae/better-template-failure-report' into...
2011-03-20 Merge branch 'mm/maint-log-n-with-diff-filtering'
2011-03-20 Merge branch 'mg/rev-list-n-reverse-doc'
2011-03-20 Merge branch 'js/rerere-forget-always-take-pathspec'
2011-03-20 Merge branch 'ab/i18n-basic'
2011-03-20 Merge branch 'uk/ls-remote-in-get-remote-url'
2011-03-20 Merge branch 'ss/mergetool--lib'
2011-03-20 Merge branch 'jn/status-translatable'
2011-03-20 Merge branch 'jk/trace-sifter'
2011-03-20 Merge branch 'jk/format-patch-multiline-header'
2011-03-20 Merge branch 'jk/merge-rename-ux'
2011-03-20 Merge branch 'maint'
2011-03-18 Merge branch 'maint'
2011-03-16 Merge branch 'maint'
2011-03-16 Merge branch 'jn/maint-commit-missing-template' into...
2011-03-16 Merge branch 'lt/rename-no-extra-copy-detection' into...
2011-03-16 Merge branch 'jk/diffstat-binary' into maint
2011-03-16 Merge branch 'mg/maint-difftool-vim-readonly' into...
2011-03-16 Merge branch 'jn/test-terminal-punt-on-osx-breakage...
2011-03-16 Merge branch 'jk/fail-null-clone' into maint
2011-03-16 Merge branch 'jh/push-default-upstream-configname'...
2011-03-16 Merge branch 'mg/placeholders-are-lowercase' into maint
2011-03-16 Merge branch 'mg/patch-id' into maint
2011-03-16 Merge branch 'js/maint-merge-use-prepare-commit-msg...
2011-03-16 cherry: split off function to print output lines
2011-03-15 Merge branch 'jk/strbuf-vaddf'
2011-03-15 Merge branch 'jn/maint-instaweb-plack-fix'
2011-03-15 Merge branch 'sp/maint-fd-limit'
2011-03-15 Merge branch 'jc/checkout-orphan-warning'
2011-03-15 Merge branch 'jh/maint-do-not-track-non-branches'
2011-03-15 Merge branch 'fk/maint-cvsimport-early-failure'
2011-03-15 Merge branch 'jc/maint-apply-report-offset'
2011-03-15 Merge branch 'jc/maint-apply-no-double-patch'
2011-03-15 Merge branch 'mr/hpux'
2011-03-14 Merge branch 'sp/maint-smart-http-sans-100-continue'
2011-03-13 Merge branch 'pw/p4'
2011-03-11 Merge branch 'maint'
2011-03-10 i18n: git-log "--OPT does not make sense" messages
2011-03-10 i18n: git-log basic messages
2011-03-09 Merge branch 'js/cherry-pick-usability'
2011-03-09 Merge branch 'js/checkout-untracked-symlink'
2011-03-09 Merge branch 'so/submodule-no-update-first-time'
2011-03-09 log: fix --max-count when used together with -S or -G
2011-03-09 Merge branch 'maint'
2011-03-09 Merge branch 'maint'
2011-03-04 Merge branch 'maint'
2011-03-04 Merge branch 'mh/p4'
2011-03-04 Merge branch 'mg/maint-difftool-vim-readonly'
2011-03-04 Merge branch 'jn/maint-commit-missing-template'
2011-03-04 Merge branch 'jk/diffstat-binary'
2011-03-04 Merge branch 'lt/rename-no-extra-copy-detection'
next