Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
Update draft release notes to 1.8.2
[gitweb.git]
/
Documentation
/
merge-strategies.txt
2012-10-01
Merge branch 'rt/maint-clone-single'
blob
|
diff
|
raw
2012-09-30
Merge git://github.com/git-l10n/git-po
blob
|
diff
|
raw
2012-09-30
Sync with 1.7.12.2
blob
|
diff
|
raw
2012-09-30
Merge branch 'rr/maint-submodule-unknown-cmd'
blob
|
diff
|
raw
2012-09-30
Merge branch 'rs/archive-zip-utf8'
blob
|
diff
|
raw
2012-09-30
Merge branch 'jk/smart-http-switch'
blob
|
diff
|
raw
2012-09-30
Merge branch 'sp/maint-http-enable-gzip'
blob
|
diff
|
raw
2012-09-30
Merge branch 'sp/maint-http-info-refs-no-retry'
blob
|
diff
|
raw
2012-09-30
Merge branch 'js/rebase-exec-command-not-found'
blob
|
diff
|
raw
2012-09-30
Merge branch 'rr/test-use-shell-path-not-shell'
blob
|
diff
|
raw
2012-09-25
Merge branch 'rr/test-make-sure-we-have-git'
blob
|
diff
|
raw
2012-09-25
Merge branch 'ep/malloc-check-perturb'
blob
|
diff
|
raw
2012-09-25
Merge branch 'aj/xfuncname-ada'
blob
|
diff
|
raw
2012-09-25
Merge branch 'jc/maint-mailinfo-mime-attr'
blob
|
diff
|
raw
2012-09-25
Merge branch 'po/maint-docs'
blob
|
diff
|
raw
2012-09-25
Merge branch 'db/doc-custom-xmlto'
blob
|
diff
|
raw
2012-09-25
Merge branch 'maint'
blob
|
diff
|
raw
2012-09-24
Sync with maint
blob
|
diff
|
raw
2012-09-21
Merge branch 'mh/fetch-filter-refs'
blob
|
diff
|
raw
2012-09-21
Merge branch 'jc/maint-log-grep-all-match-1'
blob
|
diff
|
raw
2012-09-20
Merge branch 'maint'
blob
|
diff
|
raw
2012-09-18
Merge branch 'jc/maint-log-grep-all-match'
blob
|
diff
|
raw
2012-09-18
Merge branch 'pw/p4-submit-conflicts'
blob
|
diff
|
raw
2012-09-18
Merge branch 'mv/cherry-pick-s'
blob
|
diff
|
raw
2012-09-18
Merge branch 'nd/fetch-status-alignment'
blob
|
diff
|
raw
2012-09-18
Sync with 1.7.12.1
blob
|
diff
|
raw
2012-09-17
Merge branch 'maint'
blob
|
diff
|
raw
2012-09-17
Merge branch 'mh/fetch-filter-refs'
blob
|
diff
|
raw
2012-09-17
Merge branch 'nd/maint-diffstat-summary'
blob
|
diff
|
raw
2012-09-17
Merge branch 'jk/config-warn-on-inaccessible-paths'
blob
|
diff
|
raw
2012-09-17
Merge branch 'jw/doc-commit-title'
blob
|
diff
|
raw
2012-09-17
Merge branch 'mh/string-list'
blob
|
diff
|
raw
2012-09-17
Merge branch 'jc/maint-blame-no-such-path'
blob
|
diff
|
raw
2012-09-15
Merge branch 'jc/ll-merge-binary-ours'
blob
|
diff
|
raw
2012-09-15
Merge branch 'da/gitk-reload-tag-contents' into maint...
blob
|
diff
|
raw
|
diff to current
2012-09-12
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2012-09-12
Merge branch 'da/gitk-reload-tag-contents'
blob
|
diff
|
raw
|
diff to current
2012-09-09
merge: teach -Xours/-Xtheirs to binary ll-merge driver
blob
|
diff
|
raw
2012-08-24
Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
blob
|
diff
|
raw
|
diff to current
2012-08-06
Merge branch 'jn/block-sha1' into maint
blob
|
diff
|
raw
|
diff to current
2012-08-06
Merge branch 'ms/daemon-doc-typo' into maint
blob
|
diff
|
raw
|
diff to current
2012-07-24
Merge branch 'jn/block-sha1'
blob
|
diff
|
raw
|
diff to current
2012-07-22
Merge branch 'jk/maint-commit-amend-only-no-paths'...
blob
|
diff
|
raw
|
diff to current
2012-07-22
Merge branch 'tg/maint-cache-name-compare' into maint
blob
|
diff
|
raw
|
diff to current
2012-07-22
Merge branch 'ms/daemon-doc-typo'
blob
|
diff
|
raw
|
diff to current
2012-07-16
Merge branch 'tg/maint-cache-name-compare'
blob
|
diff
|
raw
|
diff to current
2012-07-16
Merge branch 'jk/maint-commit-amend-only-no-paths'
blob
|
diff
|
raw
|
diff to current
2012-07-11
Merge branch 'tg/maint-cache-name-compare' into tg...
blob
|
diff
|
raw
|
diff to current
2012-06-25
Merge branch 'lp/no-cmd-http-fetch'
blob
|
diff
|
raw
|
diff to current
2012-06-17
Merge branch 'js/maint-fast-export-mark-error' into...
blob
|
diff
|
raw
|
diff to current
2012-06-12
Merge branch 'js/maint-fast-export-mark-error'
blob
|
diff
|
raw
|
diff to current
2012-05-23
Merge branch 'js/rebase-i-p-test-fix'
blob
|
diff
|
raw
|
diff to current
2012-04-26
Merge branch 'rs/combine-diff-zero-context-at-the-begin...
blob
|
diff
|
raw
|
diff to current
2012-04-16
Merge branch 'rs/combine-diff-zero-context-at-the-begin...
blob
|
diff
|
raw
|
diff to current
2012-04-10
Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
blob
|
diff
|
raw
|
diff to current
2012-04-02
Merge branch 'pt/gitk'
blob
|
diff
|
raw
|
diff to current
2012-03-24
Merge gitk changes from Paul Mackerras at git://ozlabs...
blob
|
diff
|
raw
|
diff to current
2012-03-16
Merge branch 'th/doc-diff-submodule-option'
blob
|
diff
|
raw
|
diff to current
2012-02-27
Merge branch 'pj/remote-set-branches-usage-fix' into...
blob
|
diff
|
raw
|
diff to current
2012-02-23
Merge branch 'pj/remote-set-branches-usage-fix'
blob
|
diff
|
raw
|
diff to current
2012-02-16
Merge branch 'mm/empty-loose-error-message' into maint
blob
|
diff
|
raw
|
diff to current
2012-02-13
Merge branch 'mm/empty-loose-error-message'
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'jk/maint-strbuf-missing-init' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-22
Merge branch 'jk/maint-strbuf-missing-init'
blob
|
diff
|
raw
|
diff to current
2011-12-21
Merge branch 'jl/submodule-status-failure-report' into...
blob
|
diff
|
raw
|
diff to current
2011-12-21
Merge branch 'tr/userdiff-c-returns-pointer' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-21
Merge branch 'ms/commit-cc-option-helpstring' into...
blob
|
diff
|
raw
|
diff to current
2011-12-18
Update jk/maint-strbuf-missing-init to builtin/ rename
blob
|
diff
|
raw
|
diff to current
2011-12-17
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'jl/submodule-status-failure-report'
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'tr/userdiff-c-returns-pointer'
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'jc/maint-name-rev-all' into maint-1.7.6
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'ml/mailmap' into maint-1.7.6
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'nd/maint-ignore-exclude'
blob
|
diff
|
raw
|
diff to current
2011-11-28
Merge branch 'nd/maint-ignore-exclude' into nd/ignore...
blob
|
diff
|
raw
|
diff to current
2011-11-23
Merge branch 'maint' into tj/imap-send-remove-unused
blob
|
diff
|
raw
|
diff to current
2011-11-21
Merge branch 'jk/maint-1.6.2-upload-archive' into jk...
blob
|
diff
|
raw
|
diff to current
2011-11-18
Merge branch 'jc/maint-name-rev-all' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-18
Merge branch 'ml/mailmap' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-12
Merge branch 'ly/mktree-using-strbuf'
blob
|
diff
|
raw
|
diff to current
2011-11-10
Merge "Move 'builtin-*' into a 'builtin/' subdirectory"
blob
|
diff
|
raw
|
diff to current
2011-11-10
Merge 'build-in git-mktree'
blob
|
diff
|
raw
|
diff to current
2011-11-09
Merge branch 'jc/remote-setbranches-usage-fix'
blob
|
diff
|
raw
|
diff to current
2011-11-09
Merge branch 'fc/remote-seturl-usage-fix'
blob
|
diff
|
raw
|
diff to current
2011-11-09
Merge branch 'jc/maint-remove-renamed-ref' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-08
Merge branch 'ss/blame-textconv-fake-working-tree'
blob
|
diff
|
raw
|
diff to current
2011-11-01
Merge branch 'md/smtp-tls-hello-again' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-01
Merge branch 'jc/maint-diffstat-numstat-context' into...
blob
|
diff
|
raw
|
diff to current
2011-11-01
Merge branch 'ss/blame-textconv-fake-working-tree'
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'maint-1.7.3' into maint-1.7.4
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'sn/doc-update-index-assume-unchanged...
blob
|
diff
|
raw
|
diff to current
2011-10-24
Merge branch 'maint-1.7.3' into maint
blob
|
diff
|
raw
|
diff to current
2011-10-21
Merge branch 'jc/maint-remove-renamed-ref'
blob
|
diff
|
raw
|
diff to current
2011-10-21
Merge branch 'cn/doc-config-bare-subsection'
blob
|
diff
|
raw
|
diff to current
2011-10-21
Merge branch 'jc/apply-blank-at-eof-fix' into maint
blob
|
diff
|
raw
|
diff to current
2011-10-21
Merge branch 'js/maint-merge-one-file-osx-expr' into...
blob
|
diff
|
raw
|
diff to current
2011-10-19
Merge branch 'js/log-show-children'
blob
|
diff
|
raw
|
diff to current
2011-10-19
Merge branch 'cb/httpd-test-fix-port'
blob
|
diff
|
raw
|
diff to current
next