Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
builtin/log.c: fix minor memory leak
[gitweb.git]
/
builtin
/
merge.c
2014-07-22
Merge branch 'maint-1.8.5' into maint-1.9
blob
|
diff
|
raw
2014-07-16
Merge branch 'maint-1.8.5' into maint-1.9
blob
|
diff
|
raw
2014-05-28
Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname...
blob
|
diff
|
raw
2014-05-28
Merge branch 'mw/symlinks' into maint
blob
|
diff
|
raw
2014-05-08
Merge branch 'cl/p4-use-diff-tree' into maint
blob
|
diff
|
raw
2014-05-08
Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname...
blob
|
diff
|
raw
2014-05-08
Merge branch 'tb/unicode-6.3-zero-width' into maint
blob
|
diff
|
raw
2014-05-08
Merge branch 'km/avoid-bs-in-shell-glob' into maint
blob
|
diff
|
raw
2014-05-08
Merge branch 'km/avoid-cp-a' into maint
blob
|
diff
|
raw
2014-04-09
Merge branch 'jl/nor-or-nand-and' into maint
blob
|
diff
|
raw
2014-04-09
Merge branch 'cn/fetch-prune-overlapping-destination...
blob
|
diff
|
raw
2014-04-09
Merge branch 'mh/update-ref-batch-create-fix' into...
blob
|
diff
|
raw
2014-04-09
Merge branch 'jk/commit-dates-parsing-fix' into maint
blob
|
diff
|
raw
2014-04-09
Merge branch 'jc/fix-diff-no-index-diff-opt-parse'...
blob
|
diff
|
raw
2014-04-09
Merge commit 'doc/http-backend: missing accent grave...
blob
|
diff
|
raw
2014-04-08
Merge branch 'mm/status-porcelain-format-i18n-fix'...
blob
|
diff
|
raw
2014-04-08
Merge branch 'bp/commit-p-editor' into maint
blob
|
diff
|
raw
2014-04-03
Merge branch 'jk/mv-submodules-fix' into maint
blob
|
diff
|
raw
|
diff to current
2014-04-03
Merge branch 'mh/remove-subtree-long-pathname-fix'...
blob
|
diff
|
raw
|
diff to current
2014-04-03
Merge branch 'jk/lib-terminal-lazy' into maint
blob
|
diff
|
raw
|
diff to current
2014-04-03
Merge branch 'nd/index-pack-error-message' into maint
blob
|
diff
|
raw
|
diff to current
2014-04-03
Merge branch 'rr/doc-merge-strategies' into maint
blob
|
diff
|
raw
|
diff to current
2014-04-03
Merge branch 'jc/stash-pop-not-popped' into maint
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'jk/clean-d-pathspec' into maint
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'da/difftool-git-files' into maint
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'jk/remote-pushremote-config-reading'...
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'jk/commit-dates-parsing-fix' into maint
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'tr/diff-submodule-no-reuse-worktree'...
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'nd/reset-setup-worktree' into maint
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'jc/check-attr-honor-working-tree' into...
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'bk/refresh-missing-ok-in-merge-recursive...
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'ds/rev-parse-required-args' into maint
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'jk/config-path-include-fix' into maint
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'nd/diff-quiet-stat-dirty' into maint
blob
|
diff
|
raw
|
diff to current
2014-03-18
merge: fix GIT_EDITOR override for commit hook
blob
|
diff
|
raw
2014-03-18
commit: fix patch hunk editing with "commit -p -m"
blob
|
diff
|
raw
|
diff to current
2014-02-13
Sync with 1.8.5.5
blob
|
diff
|
raw
|
diff to current
2014-02-13
Merge branch 'bm/merge-base-octopus-dedup' into maint
blob
|
diff
|
raw
|
diff to current
2014-02-13
Merge branch 'jc/revision-range-unpeel' into maint
blob
|
diff
|
raw
|
diff to current
2014-02-13
Merge branch 'jk/allow-fetch-onelevel-refname' into...
blob
|
diff
|
raw
|
diff to current
2014-02-13
Merge branch 'sb/repack-in-c' into maint
blob
|
diff
|
raw
|
diff to current
2014-02-13
Merge branch 'as/tree-walk-fix-aggressive-short-cut...
blob
|
diff
|
raw
|
diff to current
2014-02-07
Merge branch 'ow/manpages-typofix'
blob
|
diff
|
raw
|
diff to current
2014-02-07
Merge branch 'aj/ada-diff-word-pattern'
blob
|
diff
|
raw
|
diff to current
2014-02-07
Merge branch 'nd/tag-doc'
blob
|
diff
|
raw
|
diff to current
2014-02-05
Sync with 1.8.5.4
blob
|
diff
|
raw
|
diff to current
2014-02-05
Merge branch 'jc/maint-pull-docfix' into maint
blob
|
diff
|
raw
|
diff to current
2014-02-05
Merge branch 'bc/log-decoration' into maint
blob
|
diff
|
raw
|
diff to current
2014-02-05
Merge branch 'tr/send-email-ssl' into maint
blob
|
diff
|
raw
|
diff to current
2014-02-05
Merge branch 'tb/clone-ssh-with-colon-for-port' into...
blob
|
diff
|
raw
|
diff to current
2014-02-05
Merge branch 'nd/transport-positive-depth-only' into...
blob
|
diff
|
raw
|
diff to current
2014-02-05
Merge branch 'tb/repack-fix-renames' (early part)
blob
|
diff
|
raw
|
diff to current
2014-01-31
Merge git://github.com/git-l10n/git-po
blob
|
diff
|
raw
|
diff to current
2014-01-31
Merge branch 'jn/pager-lv-default-env'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'as/tree-walk-fix-aggressive-short-cut'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'ta/doc-http-protocol-in-html'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'mh/doc-wo-names'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'jk/revision-o-is-in-libgit-a'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'sb/repack-in-c'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'jk/test-fixes'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'nd/negative-pathspec'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'pw/git-p4'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'ss/safe-create-leading-dir-with-slash'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'mh/safe-create-leading-directories'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'tr/nth-previous-is-a-commit'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'tr/gitk-doc-range-trace'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'jk/mark-edges-uninteresting'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'jk/diff-filespec-cleanup'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'ef/mingw-write'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'rk/send-email-ssl-cert'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'jn/ignore-doc'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'jk/interpret-branch-name-fix'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'jk/allow-fetch-onelevel-refname'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'jc/revision-range-unpeel'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'mh/retire-ref-fetch-rules'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'mh/attr-macro-doc'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'jc/maint-pull-docfix'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'ab/subtree-doc'
blob
|
diff
|
raw
|
diff to current
2014-01-23
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-01-21
Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
blob
|
diff
|
raw
|
diff to current
2014-01-17
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2014-01-17
Merge branch 'fp/submodule-checkout-mode'
blob
|
diff
|
raw
|
diff to current
2014-01-17
Merge branch 'nd/shallow-clone'
blob
|
diff
|
raw
|
diff to current
2014-01-17
prefer xwrite instead of write
blob
|
diff
|
raw
|
diff to current
2014-01-17
Merge branch 'jk/pull-rebase-using-fork-point'
blob
|
diff
|
raw
|
diff to current
2014-01-14
Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
blob
|
diff
|
raw
|
diff to current
2014-01-13
Sync with 1.8.5.3
blob
|
diff
|
raw
|
diff to current
2014-01-13
Merge branch 'jk/t5531-prepare-to-default-to-non-matching'
blob
|
diff
|
raw
|
diff to current
2014-01-13
Merge branch 'sb/diff-orderfile-config'
blob
|
diff
|
raw
|
diff to current
2014-01-13
Merge branch 'mh/shorten-unambigous-ref'
blob
|
diff
|
raw
|
diff to current
2014-01-13
Merge branch 'mm/mv-file-to-no-such-dir-with-slash'
blob
|
diff
|
raw
|
diff to current
2014-01-13
Merge branch 'jk/pull-rebase-using-fork-point'
blob
|
diff
|
raw
|
diff to current
2014-01-13
Merge branch 'ow/stash-with-ifs'
blob
|
diff
|
raw
|
diff to current
2014-01-13
Merge branch 'jn/pager-lv-default-env'
blob
|
diff
|
raw
|
diff to current
2014-01-13
Merge branch 'br/sha1-name-40-hex-no-disambiguation'
blob
|
diff
|
raw
|
diff to current
2014-01-13
Merge branch 'nd/daemon-informative-errors-typofix...
blob
|
diff
|
raw
|
diff to current
2014-01-10
Merge branch 'ta/format-user-manual-as-an-article'
blob
|
diff
|
raw
|
diff to current
2014-01-10
Merge branch 'js/lift-parent-count-limit'
blob
|
diff
|
raw
|
diff to current
2014-01-10
Merge branch 'jk/test-framework-updates'
blob
|
diff
|
raw
|
diff to current
2014-01-10
Merge branch 'bm/merge-base-octopus-dedup'
blob
|
diff
|
raw
|
diff to current
next