Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
branch: do not call a "remote-tracking branch" a "remote branch"
[gitweb.git]
/
merge.c
2015-01-12
Merge branch 'jk/read-packed-refs-without-path-max...
blob
|
diff
|
raw
2015-01-12
Merge branch 'mh/find-uniq-abbrev' into maint
blob
|
diff
|
raw
2015-01-12
Merge branch 'jk/approxidate-avoid-y-d-m-over-future...
blob
|
diff
|
raw
2015-01-12
Merge branch 'rw/apply-does-not-take-ignore-date' into...
blob
|
diff
|
raw
2015-01-12
Merge branch 'jk/for-each-reflog-ent-reverse' into...
blob
|
diff
|
raw
2015-01-07
Merge branch 'maint-2.1' into maint
blob
|
diff
|
raw
2015-01-07
Merge branch 'maint-2.0' into maint-2.1
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'jk/rebuild-perl-scripts-with-no-perl...
blob
|
diff
|
raw
2014-12-22
Merge branch 'po/everyday-doc' into maint
blob
|
diff
|
raw
2014-12-22
Merge branch 'jk/push-simple' into maint
blob
|
diff
|
raw
2014-12-22
Merge branch 'mh/config-flip-xbit-back-after-checking...
blob
|
diff
|
raw
2014-12-22
Merge branch 'jk/gitweb-with-newer-cgi-multi-param...
blob
|
diff
|
raw
2014-12-22
Merge branch 'rs/receive-pack-use-labs' into maint
blob
|
diff
|
raw
2014-12-22
Merge branch 'rs/maint-config-use-labs' into maint
blob
|
diff
|
raw
2014-12-22
Merge branch 'js/windows-open-eisdir-error' into maint
blob
|
diff
|
raw
2014-12-22
Merge branch 'jk/colors-fix' into maint
blob
|
diff
|
raw
2014-12-22
Merge branch 'jk/checkout-from-tree' into maint
blob
|
diff
|
raw
2014-12-17
Sync with v2.1.4
blob
|
diff
|
raw
2014-12-17
Sync with v2.0.5
blob
|
diff
|
raw
|
diff to current
2014-11-19
Merge branch 'sv/submitting-final-patch'
blob
|
diff
|
raw
2014-11-19
Merge branch 'sn/tutorial-status-output-example'
blob
|
diff
|
raw
2014-11-19
Merge branch 'mh/doc-remote-helper-xref'
blob
|
diff
|
raw
2014-11-19
Merge branch 'tb/no-relative-file-url'
blob
|
diff
|
raw
2014-11-19
Merge branch 'cc/interpret-trailers'
blob
|
diff
|
raw
2014-11-18
Merge branch 'jc/doc-commit-only'
blob
|
diff
|
raw
2014-11-18
Merge branch 'da/difftool'
blob
|
diff
|
raw
2014-11-12
Sync with 'maint'
blob
|
diff
|
raw
2014-11-12
Merge branch 'nd/gitignore-trailing-whitespace' into...
blob
|
diff
|
raw
|
diff to current
2014-11-12
Merge branch 'jk/fetch-reflog-df-conflict'
blob
|
diff
|
raw
2014-11-11
Sync with maint
blob
|
diff
|
raw
2014-11-11
Merge branch 'rs/clean-menu-item-defn' into maint
blob
|
diff
|
raw
|
diff to current
2014-11-10
Sync with maint
blob
|
diff
|
raw
2014-11-10
Merge branch 'js/diff-highlight-avoid-sigpipe'
blob
|
diff
|
raw
2014-11-06
Merge branch 'maint'
blob
|
diff
|
raw
2014-11-06
Merge branch 'nd/gitignore-trailing-whitespace'
blob
|
diff
|
raw
2014-11-06
Merge branch 'tm/line-log-first-parent'
blob
|
diff
|
raw
2014-11-06
Merge branch 'jk/fetch-reflog-df-conflict'
blob
|
diff
|
raw
2014-11-06
Merge branch 'jk/cache-tree-protect-from-broken-libgit2'
blob
|
diff
|
raw
2014-10-31
Merge branch 'jc/push-cert'
blob
|
diff
|
raw
2014-10-31
Merge branch 'rs/child-process-init'
blob
|
diff
|
raw
2014-10-31
Merge branch 'rs/grep-color-words'
blob
|
diff
|
raw
2014-10-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2014-10-29
Sync with Git 2.1.3
blob
|
diff
|
raw
2014-10-29
Merge branch 'jk/pack-objects-no-bitmap-when-splitting...
blob
|
diff
|
raw
|
diff to current
2014-10-29
Merge branch 'rm/gitweb-start-form' into maint
blob
|
diff
|
raw
|
diff to current
2014-10-29
Merge branch 'bc/asciidoc-pretty-formats-fix' into...
blob
|
diff
|
raw
|
diff to current
2014-10-29
Merge branch 'rs/daemon-fixes' into maint
blob
|
diff
|
raw
|
diff to current
2014-10-29
Merge branch 'da/difftool'
blob
|
diff
|
raw
2014-10-29
Merge branch 'rb/pack-window-memory-config-doc'
blob
|
diff
|
raw
2014-10-29
Merge branch 'mg/lib-gpg-ro-safety'
blob
|
diff
|
raw
2014-10-29
Merge branch 'dm/port2zos'
blob
|
diff
|
raw
2014-10-29
Merge branch 'oc/mergetools-beyondcompare'
blob
|
diff
|
raw
2014-10-29
Merge branch 'jk/prune-mtime'
blob
|
diff
|
raw
2014-10-29
Merge branch 'bc/asciidoctor'
blob
|
diff
|
raw
2014-10-24
Merge branch 'jc/push-cert'
blob
|
diff
|
raw
2014-10-24
Merge branch 'sb/plug-transport-leak'
blob
|
diff
|
raw
2014-10-24
Merge branch 'nd/dir-prep-exclude-cleanup'
blob
|
diff
|
raw
2014-10-24
Merge branch 'eb/no-pthreads'
blob
|
diff
|
raw
2014-10-24
Merge branch 'wk/t1304-wo-USER'
blob
|
diff
|
raw
2014-10-24
Merge branch 'tb/core-filemode-doc'
blob
|
diff
|
raw
2014-10-24
Merge branch 'po/doc-status-markup'
blob
|
diff
|
raw
2014-10-24
Merge branch 'jk/pack-objects-no-bitmap-when-splitting'
blob
|
diff
|
raw
2014-10-21
Merge branch 'da/mergetool-meld'
blob
|
diff
|
raw
2014-10-21
Merge branch 'da/mergetool-temporary-directory'
blob
|
diff
|
raw
2014-10-21
Merge branch 'da/mergetool-tool-help'
blob
|
diff
|
raw
2014-10-21
Merge branch 'da/mergetool-temporary-filename'
blob
|
diff
|
raw
2014-10-21
Merge branch 'da/mergetool-tests'
blob
|
diff
|
raw
2014-10-20
Merge branch 'cc/interpret-trailers'
blob
|
diff
|
raw
2014-10-20
Merge branch 'rm/gitweb-start-form'
blob
|
diff
|
raw
2014-10-20
Merge branch 'jn/parse-config-slot'
blob
|
diff
|
raw
2014-10-20
Merge branch 'rs/receive-pack-argv-leak-fix'
blob
|
diff
|
raw
2014-10-20
Merge branch 'ta/config-set'
blob
|
diff
|
raw
2014-10-20
Merge branch 'jk/test-shell-trace'
blob
|
diff
|
raw
2014-10-20
Merge branch 'bc/asciidoc'
blob
|
diff
|
raw
2014-10-16
Merge branch 'jc/completion-no-chdir'
blob
|
diff
|
raw
2014-10-16
Merge branch 'bw/trace-no-inline-getnanotime'
blob
|
diff
|
raw
2014-10-16
Merge branch 'po/everyday-doc'
blob
|
diff
|
raw
2014-10-14
Merge branch 'bc/asciidoc-pretty-formats-fix'
blob
|
diff
|
raw
2014-10-14
Merge branch 'rs/plug-leak-in-bundle'
blob
|
diff
|
raw
2014-10-14
Merge branch 'rs/more-uses-of-skip-prefix'
blob
|
diff
|
raw
2014-10-14
Merge branch 'rs/mailsplit'
blob
|
diff
|
raw
2014-10-14
Merge branch 'rs/sha1-array-test'
blob
|
diff
|
raw
2014-10-14
Merge branch 'mh/lockfile'
blob
|
diff
|
raw
2014-10-14
Merge branch 'sk/tag-contains-wo-recursion'
blob
|
diff
|
raw
|
diff to current
2014-10-14
Merge branch 'rs/daemon-fixes'
blob
|
diff
|
raw
|
diff to current
2014-10-14
Merge branch 'dt/cache-tree-repair'
blob
|
diff
|
raw
|
diff to current
2014-10-14
Merge branch 'so/rebase-doc-fork-point'
blob
|
diff
|
raw
|
diff to current
2014-10-08
Merge branch 'nd/archive-pathspec'
blob
|
diff
|
raw
|
diff to current
2014-10-07
Merge branch 'maint-2.0' into maint
blob
|
diff
|
raw
|
diff to current
2014-10-01
lockfile.h: extract new header file for the functions...
blob
|
diff
|
raw
2014-09-30
Merge branch 'jc/test-lazy-prereq'
blob
|
diff
|
raw
|
diff to current
2014-09-30
Merge branch 'sb/merge-recursive-copy-paste-fix'
blob
|
diff
|
raw
|
diff to current
2014-09-30
Merge branch 'jk/fsck-exit-code-fix' into maint
blob
|
diff
|
raw
|
diff to current
2014-09-30
Merge branch 'ta/config-add-to-empty-or-true-fix' into...
blob
|
diff
|
raw
|
diff to current
2014-09-30
Merge branch 'jk/index-pack-threading-races' into maint
blob
|
diff
|
raw
|
diff to current
2014-09-30
Merge branch 'so/rebase-doc' into maint
blob
|
diff
|
raw
|
diff to current
2014-09-29
Merge branch 'sb/t6031-typofix'
blob
|
diff
|
raw
|
diff to current
2014-09-29
Merge branch 'sb/t9300-typofix'
blob
|
diff
|
raw
|
diff to current
2014-09-26
Merge branch 'sb/help-unknown-command-sort-fix'
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'et/spell-poll-infinite-with-minus-one...
blob
|
diff
|
raw
|
diff to current
next