Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/parse-object-cached'
[gitweb.git]
/
builtin
/
merge.c
2011-12-20
Merge branch 'tr/cache-tree'
blob
|
diff
|
raw
2011-12-20
Merge branch 'ab/enable-i18n'
blob
|
diff
|
raw
2011-12-20
Merge branch 'ew/keepalive'
blob
|
diff
|
raw
2011-12-20
Merge branch 'jc/checkout-m-twoway'
blob
|
diff
|
raw
2011-12-20
Merge branch 'jk/maint-push-over-dav'
blob
|
diff
|
raw
2011-12-20
Merge branch 'jk/fetch-no-tail-match-refs'
blob
|
diff
|
raw
2011-12-20
Merge branch 'nd/resolve-ref'
blob
|
diff
|
raw
2011-12-20
Merge branch 'jn/maint-sequencer-fixes'
blob
|
diff
|
raw
|
diff to current
2011-12-20
Merge branch 'jk/maint-snprintf-va-copy'
blob
|
diff
|
raw
|
diff to current
2011-12-20
Merge branch 'jk/maint-mv'
blob
|
diff
|
raw
|
diff to current
2011-12-20
Merge branch 'ci/stripspace-docs'
blob
|
diff
|
raw
|
diff to current
2011-12-20
Merge branch 'rr/test-chaining'
blob
|
diff
|
raw
|
diff to current
2011-12-20
Merge branch 'tr/cache-tree'
blob
|
diff
|
raw
|
diff to current
2011-12-20
Merge branch 'jk/credentials'
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 branch 'jc/commit-amend-no-edit'
blob
|
diff
|
raw
|
diff to current
2011-12-17
Merge branch 'jc/stream-to-pack'
blob
|
diff
|
raw
|
diff to current
2011-12-17
Merge branch 'aw/rebase-i-stop-on-failure-to-amend'
blob
|
diff
|
raw
|
diff to current
2011-12-17
Merge branch 'jh/fast-import-notes'
blob
|
diff
|
raw
|
diff to current
2011-12-17
Merge branch 'jk/upload-archive-use-start-command'
blob
|
diff
|
raw
|
diff to current
2011-12-17
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2011-12-15
Convert commit_tree() to take strbuf as message
blob
|
diff
|
raw
|
diff to current
2011-12-15
merge: abort if fails to commit
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'ks/tag-cleanup'
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 'bc/maint-apply-check-no-patch'
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'nd/ignore-might-be-precious'
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'jn/branch-move-to-self'
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'cn/maint-lf-to-crlf-filter'
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'tj/maint-imap-send-remove-unused'
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'jk/maint-upload-archive'
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'jn/gitweb-side-by-side-diff'
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'jc/maint-pack-object-cycle' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'jc/index-pack-reject-dups' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'mf/curl-select-fdset' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'nd/misc-cleanups' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'maint-1.7.7' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'ab/clang-lints' into maint-1.7.7
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 'maint-1.7.6' into maint-1.7.7
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'jk/maint-fetch-status-table' into maint...
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-13
Convert resolve_ref+xstrdup to new resolve_refdup function
blob
|
diff
|
raw
|
diff to current
2011-12-09
Merge branch 'sg/complete-refs'
blob
|
diff
|
raw
|
diff to current
2011-12-09
Merge branch 'nd/resolve-ref'
blob
|
diff
|
raw
|
diff to current
2011-12-09
Merge branch 'jc/pull-signed-tag'
blob
|
diff
|
raw
|
diff to current
2011-12-09
Merge branch 'jc/request-pull-show-head-4'
blob
|
diff
|
raw
|
diff to current
2011-12-09
Merge branch 'ab/pull-rebase-config'
blob
|
diff
|
raw
|
diff to current
2011-12-09
Merge branch 'rs/allocate-cache-entry-individually'
blob
|
diff
|
raw
|
diff to current
2011-12-09
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2011-12-09
Merge branch 'maint-1.7.7' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-06
Merge branch 'master' of git://bogomips.org/git-svn
blob
|
diff
|
raw
|
diff to current
2011-12-06
Copy resolve_ref() return value for longer use
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'jk/refresh-porcelain-output'
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'gh/userdiff-matlab'
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'nd/maint-ignore-exclude'
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'vr/git-merge-default-to-upstream'
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'jc/maint-pack-object-cycle'
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'jc/index-pack-reject-dups'
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'vr/msvc'
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'na/strtoimax'
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'ab/clang-lints'
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'nd/prune-progress'
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'nd/fsck-progress'
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'mf/curl-select-fdset'
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'nd/misc-cleanups'
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'maint-1.7.7' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'maint-1.7.6' into maint-1.7.7
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'js/merge-edit-option'
blob
|
diff
|
raw
|
diff to current
2011-11-28
checkout,merge: disallow overwriting ignored files...
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-28
checkout,merge: loosen overwriting untracked file check...
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-21
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2011-11-21
Merge branch 'rr/misc-fixes'
blob
|
diff
|
raw
|
diff to current
2011-11-21
Show error for 'git merge' with unset merge.defaultToUp...
blob
|
diff
|
raw
|
diff to current
2011-11-18
Merge branch 'rr/misc-fixes'
blob
|
diff
|
raw
|
diff to current
2011-11-18
Sync with 1.7.7.4
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-18
Merge branch 'jn/maint-notes-avoid-va-args' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-17
do not let git_path clobber errno when reporting errors
blob
|
diff
|
raw
|
diff to current
2011-11-13
Convert many resolve_ref() calls to read_ref*() and...
blob
|
diff
|
raw
|
diff to current
2011-11-13
commit: teach --gpg-sign option
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-09
merge: force edit and no-ff mode when merging a tag...
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
Sync with 1.7.7.3
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-09
Merge branch 'jm/maint-gitweb-filter-forks-fix' into...
blob
|
diff
|
raw
|
diff to current
2011-11-09
Merge branch 'dm/pack-objects-update' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-08
merge: record tag objects without peeling in MERGE_HEAD
blob
|
diff
|
raw
|
diff to current
2011-11-08
merge: make usage of commit->util more extensible
blob
|
diff
|
raw
|
diff to current
next