Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
merge-recursive: Save D/F conflict filenames instead of unlinking them
[gitweb.git]
/
transport.h
2011-06-01
Merge branch 'jk/maint-config-alias-fix' into maint
blob
|
diff
|
raw
2011-06-01
Merge branch 'kk/maint-prefix-in-config-mak' into maint
blob
|
diff
|
raw
2011-05-31
Merge branch 'jc/rename-degrade-cc-to-c' into maint
blob
|
diff
|
raw
2011-05-31
Merge branch 'rr/doc-content-type' into maint
blob
|
diff
|
raw
2011-05-30
Merge branch 'jm/maint-misc-fix' into maint
blob
|
diff
|
raw
2011-05-26
Merge branch 'maint-1.7.4' into maint
blob
|
diff
|
raw
2011-05-26
Merge branch 'jk/git-connection-deadlock-fix' into...
blob
|
diff
|
raw
|
diff to current
2011-05-26
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
blob
|
diff
|
raw
|
diff to current
2011-05-26
Merge branch 'jm/maint-diff-words-with-sbe' into maint
blob
|
diff
|
raw
2011-05-26
Merge branch 'kk/maint-prefix-in-config-mak' into maint
blob
|
diff
|
raw
2011-05-26
Merge branch 'ss/doc-svn' into maint
blob
|
diff
|
raw
2011-05-26
Merge branch 'rg/copy-gecos-username' into maint
blob
|
diff
|
raw
2011-05-26
Merge branch 'jk/git-connection-deadlock-fix' into...
blob
|
diff
|
raw
2011-05-26
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
blob
|
diff
|
raw
2011-05-26
Merge branch 'svn-fe-maint' of git://repo.or.cz/git...
blob
|
diff
|
raw
2011-05-17
Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
blob
|
diff
|
raw
|
diff to current
2011-05-16
Merge branch 'jn/maint-format-patch-doc' into maint
blob
|
diff
|
raw
2011-05-16
Merge branch 'ss/cherry-pick-x-doc' into maint
blob
|
diff
|
raw
2011-05-16
Merge branch 'vr/merge-base-doc' into maint
blob
|
diff
|
raw
2011-05-16
Merge branch 'jc/t1506-shell-param-expansion-gotcha...
blob
|
diff
|
raw
2011-05-16
Merge branch 'jc/fix-add-u-unmerged' into maint
blob
|
diff
|
raw
2011-05-16
Merge branch 'jc/maint-branch-mergeoptions' into maint
blob
|
diff
|
raw
2011-05-16
Merge branch 'jc/maint-add-p-overlapping-hunks' into...
blob
|
diff
|
raw
2011-05-15
Merge branch 'jk/format-patch-quote-special-in-from...
blob
|
diff
|
raw
2011-05-13
Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
blob
|
diff
|
raw
2011-05-13
Merge branch 'gr/cvsimport-alternative-cvspass-location...
blob
|
diff
|
raw
2011-05-13
Merge branch 'jk/merge-one-file-working-tree' into...
blob
|
diff
|
raw
2011-05-13
Merge branch 'jc/fix-diff-files-unmerged' into maint
blob
|
diff
|
raw
2011-05-13
Merge branch 'mz/maint-rename-unmerged' into maint
blob
|
diff
|
raw
2011-05-11
Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
blob
|
diff
|
raw
2011-05-11
Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
blob
|
diff
|
raw
|
diff to current
2011-05-05
Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
blob
|
diff
|
raw
|
diff to current
2011-05-04
Merge branch 'jh/dirstat' into maint
blob
|
diff
|
raw
2011-05-04
Merge branch 'sp/maint-clear-postfields' into maint
blob
|
diff
|
raw
2011-05-04
Merge branch 'jk/maint-stash-oob' into maint
blob
|
diff
|
raw
2011-05-04
Merge branch 'jk/maint-upload-pack-shallow' into maint
blob
|
diff
|
raw
2011-05-04
Merge branch 'jc/pack-objects-bigfile' into maint
blob
|
diff
|
raw
2011-05-04
Merge branch 'mg/reflog-with-options' into maint
blob
|
diff
|
raw
2011-05-04
Merge branch 'ar/clean-rmdir-empty' into maint
blob
|
diff
|
raw
2011-05-04
Merge branch 'mg/sha1-path-advise' into maint
blob
|
diff
|
raw
2011-04-29
Merge branch 'mg/x-years-12-months' into maint
blob
|
diff
|
raw
2011-04-25
Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
blob
|
diff
|
raw
|
diff to current
2011-04-19
Sync with 1.7.4.5
blob
|
diff
|
raw
2011-04-15
Merge v1.7.5-rc2 into jn/format-patch-doc
blob
|
diff
|
raw
2011-04-14
Merge branch 'maint'
blob
|
diff
|
raw
2011-04-13
Merge branch 'maint'
blob
|
diff
|
raw
2011-04-12
Merge branch 'js/checkout-untracked-symlink'
blob
|
diff
|
raw
2011-04-12
Merge branch 'nd/init-gitdir'
blob
|
diff
|
raw
2011-04-11
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2011-04-06
Sync with 1.7.4.4
blob
|
diff
|
raw
2011-04-06
Merge branch 'jk/maint-remote-mirror-safer'
blob
|
diff
|
raw
2011-04-04
Merge branch 'maint'
blob
|
diff
|
raw
2011-04-04
Merge branch 'jl/submodule-fetch-on-demand'
blob
|
diff
|
raw
2011-04-04
Merge branch 'jc/rev-list-options-fix'
blob
|
diff
|
raw
2011-04-04
Merge branch 'nm/maint-conflicted-submodule-entries'
blob
|
diff
|
raw
2011-04-03
Merge branch 'maint'
blob
|
diff
|
raw
2011-04-03
Merge branch 'jc/index-update-if-able' into maint
blob
|
diff
|
raw
|
diff to current
2011-04-03
Merge branch 'jc/maint-rev-list-culled-boundary' into...
blob
|
diff
|
raw
|
diff to current
2011-04-03
Sync with 1.7.4.3
blob
|
diff
|
raw
2011-04-02
Merge branch 'nd/init-gitdir'
blob
|
diff
|
raw
2011-04-02
Merge branch 'jc/merge-sans-branch'
blob
|
diff
|
raw
2011-04-02
Merge branch 'ab/i18n-st'
blob
|
diff
|
raw
2011-04-02
Merge branch 'sb/sparse-more'
blob
|
diff
|
raw
2011-04-02
Merge branch 'maint'
blob
|
diff
|
raw
2011-04-01
Merge branch 'nd/index-doc' into maint
blob
|
diff
|
raw
|
diff to current
2011-04-01
Merge branch 'jc/maint-diff-q-filter' into maint
blob
|
diff
|
raw
|
diff to current
2011-04-01
Merge branch 'mg/doc-bisect-tweak-worktree' into maint
blob
|
diff
|
raw
|
diff to current
2011-04-01
Merge branch 'jh/maint-do-not-track-non-branches' into...
blob
|
diff
|
raw
|
diff to current
2011-04-01
Merge "checkout ambiguous ref bugfix" into maint
blob
|
diff
|
raw
|
diff to current
2011-03-31
Merge branch 'maint'
blob
|
diff
|
raw
2011-03-30
Merge branch 'maint'
blob
|
diff
|
raw
2011-03-30
Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
blob
|
diff
|
raw
2011-03-29
Merge branch 'maint'
blob
|
diff
|
raw
2011-03-29
Merge branch 'jc/fetch-progressive-stride'
blob
|
diff
|
raw
2011-03-29
Merge branches 'sp/maint-fetch-pack-stop-early' and...
blob
|
diff
|
raw
2011-03-28
Merge branch 'maint'
blob
|
diff
|
raw
2011-03-27
Merge branch 'mg/rev-list-n-parents'
blob
|
diff
|
raw
2011-03-27
Merge branch 'js/remove-unused-variables'
blob
|
diff
|
raw
2011-03-27
Merge branch 'jp/completion-help-alias'
blob
|
diff
|
raw
2011-03-27
Merge branch 'jc/index-update-if-able'
blob
|
diff
|
raw
2011-03-27
Merge branch 'jk/checkout-orphan-warning'
blob
|
diff
|
raw
2011-03-27
Merge branch 'jc/maint-rerere-in-workdir'
blob
|
diff
|
raw
2011-03-27
Merge branch 'nd/index-doc'
blob
|
diff
|
raw
2011-03-27
Merge branch 'jc/fetch-progressive-stride'
blob
|
diff
|
raw
2011-03-26
Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
blob
|
diff
|
raw
2011-03-26
Merge git-gui 0.14.0
blob
|
diff
|
raw
2011-03-26
Sync with 1.7.4.2
blob
|
diff
|
raw
2011-03-23
Merge branch 'kc/gitweb-pathinfo-w-anchor'
blob
|
diff
|
raw
2011-03-23
Merge branch 'jn/fortify-source-workaround'
blob
|
diff
|
raw
2011-03-23
Merge branch 'jn/maint-c99-format'
blob
|
diff
|
raw
2011-03-23
Merge branch 'lt/default-abbrev'
blob
|
diff
|
raw
2011-03-23
Merge branch 'pk/stash-apply-status-relative'
blob
|
diff
|
raw
2011-03-23
Merge branch 'jc/maint-diff-q-filter'
blob
|
diff
|
raw
2011-03-23
Merge branch 'pw/p4'
blob
|
diff
|
raw
2011-03-23
Merge branch 'mg/rev-list-one-side-only'
blob
|
diff
|
raw
2011-03-23
Merge branch 'js/maint-stash-index-copy'
blob
|
diff
|
raw
2011-03-23
Merge branch 'tl/p4'
blob
|
diff
|
raw
2011-03-23
Merge branch 'mg/doc-bisect-tweak-worktree'
blob
|
diff
|
raw
2011-03-23
Merge branch 'jn/test-sanitize-git-env'
blob
|
diff
|
raw
2011-03-23
Merge branch 'sp/maint-upload-pack-stop-early'
blob
|
diff
|
raw
next