Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
pull: support pull.ff config
[gitweb.git]
/
ll-merge.c
2015-06-05
Merge branch 'jk/skip-http-tests-under-no-curl' into...
blob
|
diff
|
raw
2015-06-05
Merge branch 'jk/rerere-forget-check-enabled' into...
blob
|
diff
|
raw
2015-06-05
Merge branch 'ja/tutorial-asciidoctor-fix' into maint
blob
|
diff
|
raw
2015-06-05
Merge branch 'jk/stripspace-asciidoctor-fix' into maint
blob
|
diff
|
raw
2015-06-05
Merge branch 'ps/bundle-verify-arg' into maint
blob
|
diff
|
raw
2015-06-05
Merge branch 'sb/t1020-cleanup' into maint
blob
|
diff
|
raw
2015-06-05
Merge branch 'jc/gitignore-precedence' into maint
blob
|
diff
|
raw
2015-06-05
Merge branch 'jk/add-e-kill-editor' into maint
blob
|
diff
|
raw
2015-06-05
Merge branch 'jk/sha1-file-reduce-useless-warnings...
blob
|
diff
|
raw
2015-06-05
Merge branch 'tb/blame-resurrect-convert-to-git' into...
blob
|
diff
|
raw
2015-06-05
Merge branch 'jc/plug-fmt-merge-msg-leak' into maint
blob
|
diff
|
raw
2015-06-01
Merge branch 'mm/rebase-i-post-rewrite-exec'
blob
|
diff
|
raw
2015-06-01
Merge branch 'mm/log-format-raw-doc'
blob
|
diff
|
raw
2015-06-01
Merge branch 'mc/commit-doc-grammofix'
blob
|
diff
|
raw
2015-06-01
Merge branch 'jh/filter-empty-contents'
blob
|
diff
|
raw
2015-06-01
Merge branch 'dt/clean-pathspec-filter-then-lstat'
blob
|
diff
|
raw
2015-05-26
Merge branch 'jk/still-interesting' into maint
blob
|
diff
|
raw
2015-05-26
Merge branch 'jk/rebase-quiet-noop' into maint
blob
|
diff
|
raw
2015-05-26
Merge branch 'sg/complete-decorate-full-not-long' into...
blob
|
diff
|
raw
2015-05-26
Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
blob
|
diff
|
raw
2015-05-26
Merge branch 'jk/rerere-forget-check-enabled'
blob
|
diff
|
raw
2015-05-22
Merge branch 'sb/t1020-cleanup'
blob
|
diff
|
raw
2015-05-22
Merge branch 'lm/squelch-bg-progress'
blob
|
diff
|
raw
2015-05-22
Merge branch 'jk/add-e-kill-editor'
blob
|
diff
|
raw
2015-05-22
Merge branch 'jk/stripspace-asciidoctor-fix'
blob
|
diff
|
raw
2015-05-22
Merge branch 'ja/tutorial-asciidoctor-fix'
blob
|
diff
|
raw
2015-05-22
Merge branch 'ps/bundle-verify-arg'
blob
|
diff
|
raw
2015-05-22
Merge branch 'jk/skip-http-tests-under-no-curl'
blob
|
diff
|
raw
2015-05-22
Merge branch 'sg/completion-omit-credential-helpers'
blob
|
diff
|
raw
2015-05-19
Merge branch 'jc/gitignore-precedence'
blob
|
diff
|
raw
2015-05-13
Merge branch 'nd/t1509-chroot-test' into maint
blob
|
diff
|
raw
2015-05-13
Merge branch 'jk/type-from-string-gently' into maint
blob
|
diff
|
raw
2015-05-13
Merge branch 'ep/fix-test-lib-functions-report' into...
blob
|
diff
|
raw
2015-05-13
Merge branch 'jk/init-core-worktree-at-root' into maint
blob
|
diff
|
raw
2015-05-11
Merge branch 'jc/diff-no-index-d-f' into maint-2.3
blob
|
diff
|
raw
2015-05-11
Merge branch 'oh/fix-config-default-user-name-section...
blob
|
diff
|
raw
2015-05-11
Merge branch 'jc/epochtime-wo-tz' into maint-2.3
blob
|
diff
|
raw
2015-05-11
Merge branch 'sg/complete-decorate-full-not-long'
blob
|
diff
|
raw
2015-05-11
Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
blob
|
diff
|
raw
2015-05-11
Merge branch 'tb/blame-resurrect-convert-to-git'
blob
|
diff
|
raw
2015-05-11
Merge branch 'va/fix-git-p4-tests'
blob
|
diff
|
raw
2015-05-11
Merge branch 'jk/rebase-quiet-noop'
blob
|
diff
|
raw
2015-05-11
Merge branch 'jc/plug-fmt-merge-msg-leak'
blob
|
diff
|
raw
2015-05-11
Merge branch 'jk/still-interesting'
blob
|
diff
|
raw
2015-05-11
Merge branch 'lm/squelch-bg-progress'
blob
|
diff
|
raw
2015-05-11
Merge branch 'jk/sha1-file-reduce-useless-warnings'
blob
|
diff
|
raw
2015-05-06
Merge branch 'ep/fix-test-lib-functions-report'
blob
|
diff
|
raw
2015-05-06
Merge branch 'jc/epochtime-wo-tz'
blob
|
diff
|
raw
2015-05-06
Merge branch 'nd/t1509-chroot-test'
blob
|
diff
|
raw
2015-05-06
Merge branch 'oh/fix-config-default-user-name-section'
blob
|
diff
|
raw
2015-05-06
Merge branch 'jk/type-from-string-gently'
blob
|
diff
|
raw
2015-05-06
Merge branch 'jk/init-core-worktree-at-root'
blob
|
diff
|
raw
2015-05-06
Merge branch 'jc/diff-no-index-d-f'
blob
|
diff
|
raw
2015-04-28
Merge branch 'mg/show-notes-doc'
blob
|
diff
|
raw
2015-04-27
Merge branch 'ma/bash-completion-leaking-x' into maint
blob
|
diff
|
raw
2015-04-27
Merge branch 'jc/push-cert' into maint
blob
|
diff
|
raw
2015-04-21
Merge branch 'jk/colors' into maint
blob
|
diff
|
raw
2015-04-21
Merge branch 'pt/enter-repo-comment-fix' into maint
blob
|
diff
|
raw
2015-04-21
Merge branch 'jz/gitweb-conf-doc-fix' into maint
blob
|
diff
|
raw
2015-04-21
Merge branch 'jk/cherry-pick-docfix' into maint
blob
|
diff
|
raw
2015-04-21
Merge branch 'iu/fix-parse-options-h-comment' into...
blob
|
diff
|
raw
2015-04-21
Merge branch 'jg/cguide-we-cannot-count' into maint
blob
|
diff
|
raw
2015-04-21
Merge branch 'jn/doc-fast-import-no-16-octopus-limit...
blob
|
diff
|
raw
2015-04-20
Merge branch 'ps/grep-help-all-callback-arg'
blob
|
diff
|
raw
2015-04-20
Merge branch 'va/fix-git-p4-tests'
blob
|
diff
|
raw
2015-04-20
Merge branch 'jc/push-cert'
blob
|
diff
|
raw
2015-04-20
Merge branch 'ma/bash-completion-leaking-x'
blob
|
diff
|
raw
2015-04-19
Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
blob
|
diff
|
raw
2015-04-14
Merge branch 'jk/colors'
blob
|
diff
|
raw
2015-04-14
Merge branch 'jk/merge-quiet'
blob
|
diff
|
raw
2015-04-14
Merge branch 'sb/plug-streaming-leak'
blob
|
diff
|
raw
2015-04-14
Merge branch 'jn/doc-fast-import-no-16-octopus-limit'
blob
|
diff
|
raw
2015-04-14
Merge branch 'sb/plug-wt-shortstatus-tracking-leak'
blob
|
diff
|
raw
2015-04-14
Merge branch 'pt/enter-repo-comment-fix'
blob
|
diff
|
raw
2015-04-14
Merge branch 'jz/gitweb-conf-doc-fix'
blob
|
diff
|
raw
2015-04-14
Merge branch 'jk/cherry-pick-docfix'
blob
|
diff
|
raw
2015-04-14
Merge branch 'iu/fix-parse-options-h-comment'
blob
|
diff
|
raw
2015-04-14
Merge branch 'jg/cguide-we-cannot-count'
blob
|
diff
|
raw
2015-03-31
Merge branch 'ss/pull-rebase-preserve' into maint
blob
|
diff
|
raw
2015-03-31
Merge branch 'jc/report-path-error-to-dir' into maint
blob
|
diff
|
raw
2015-03-31
Merge branch 'ph/push-doc-cas' into maint
blob
|
diff
|
raw
2015-03-28
Merge branch 'ph/push-doc-cas'
blob
|
diff
|
raw
2015-03-28
Merge branch 'ss/pull-rebase-preserve'
blob
|
diff
|
raw
2015-03-28
Merge branch 'jk/simplify-csum-file-sha1fd-check' into...
blob
|
diff
|
raw
2015-03-28
Merge branch 'nd/doc-git-index-version' into maint
blob
|
diff
|
raw
2015-03-28
Merge branch 'ct/prompt-untracked-fix' into maint
blob
|
diff
|
raw
2015-03-28
Merge branch 'ws/grep-quiet-no-pager' into maint
blob
|
diff
|
raw
2015-03-28
Merge branch 'jc/submitting-patches-mention-send-email...
blob
|
diff
|
raw
2015-03-28
Merge branch 'jk/cleanup-failed-clone' into maint
blob
|
diff
|
raw
2015-03-27
Merge branch 'jk/tag-h-column-is-a-listing-option'...
blob
|
diff
|
raw
2015-03-27
Merge branch 'jk/smart-http-hide-refs' into maint
blob
|
diff
|
raw
2015-03-27
Merge branch 'js/completion-ctags-pattern-substitution...
blob
|
diff
|
raw
2015-03-26
Merge branch 'jc/report-path-error-to-dir'
blob
|
diff
|
raw
2015-03-25
Merge branch 'nd/doc-git-index-version'
blob
|
diff
|
raw
2015-03-25
Merge branch 'jk/cleanup-failed-clone'
blob
|
diff
|
raw
2015-03-25
Merge branch 'jc/submitting-patches-mention-send-email'
blob
|
diff
|
raw
2015-03-25
Merge branch 'kd/rev-list-bisect-first-parent'
blob
|
diff
|
raw
2015-03-25
Merge branch 'ws/grep-quiet-no-pager'
blob
|
diff
|
raw
2015-03-25
Merge branch 'jk/simplify-csum-file-sha1fd-check'
blob
|
diff
|
raw
2015-03-25
Merge branch 'ct/prompt-untracked-fix'
blob
|
diff
|
raw
next