tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Update 1.7.6 draft release notes
[git.git]
/
ll-merge.c
2011-05-23
Junio C Hamano
Merge branch 'jm/maint-diff-words-with-sbe'
blob
|
commitdiff
|
raw
2011-05-20
Junio C Hamano
Merge branch 'rg/copy-gecos-username'
blob
|
commitdiff
|
raw
2011-05-20
Junio C Hamano
Merge branch 'jk/git-connection-deadlock-fix'
blob
|
commitdiff
|
raw
2011-05-20
Junio C Hamano
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
blob
|
commitdiff
|
raw
2011-05-17
Junio C Hamano
Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'jc/fix-add-u-unmerged' into maint
blob
|
commitdiff
|
raw
2011-05-16
Junio C Hamano
Merge branch 'jc/maint-branch-mergeoptions' into maint
blob
|
commitdiff
|
raw
2011-05-13
Junio C Hamano
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
blob
|
commitdiff
|
raw
2011-05-13
Junio C Hamano
Merge branch 'jc/fix-add-u-unmerged'
blob
|
commitdiff
|
raw
2011-05-13
Junio C Hamano
Merge branch 'jk/merge-one-file-working-tree' into...
blob
|
commitdiff
|
raw
2011-05-13
Junio C Hamano
Merge branch 'jc/fix-diff-files-unmerged' into maint
blob
|
commitdiff
|
raw
2011-05-13
Junio C Hamano
Merge branch 'mz/maint-rename-unmerged' into maint
blob
|
commitdiff
|
raw
2011-05-11
Junio C Hamano
Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
blob
|
commitdiff
|
raw
2011-05-11
Junio C Hamano
Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
blob
|
commitdiff
|
raw
2011-05-11
Junio C Hamano
Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
blob
|
commitdiff
|
raw
2011-05-11
Junio C Hamano
Merge branch 'jc/maint-branch-mergeoptions'
blob
|
commitdiff
|
raw
2011-05-06
Junio C Hamano
Merge branch 'jc/maint-branch-mergeoptions' into mg...
blob
|
commitdiff
|
raw
2011-05-06
Junio C Hamano
Merge branch 'im/hashcmp-optim'
blob
|
commitdiff
|
raw
2011-05-06
Junio C Hamano
Merge branch 'jk/merge-one-file-working-tree'
blob
|
commitdiff
|
raw
2011-05-06
Junio C Hamano
Merge branch 'jc/fix-diff-files-unmerged'
blob
|
commitdiff
|
raw
2011-05-05
Junio C Hamano
Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'sp/maint-clear-postfields' into maint
blob
|
commitdiff
|
raw
2011-05-02
Junio C Hamano
Merge branch 'mz/maint-rename-unmerged'
blob
|
commitdiff
|
raw
2011-04-29
Junio C Hamano
Merge branch 'mg/x-years-12-months' into maint
blob
|
commitdiff
|
raw
2011-04-28
Junio C Hamano
Merge branch 'en/merge-recursive'
blob
|
commitdiff
|
raw
2011-04-28
Junio C Hamano
Merge branch 'sp/maint-clear-postfields'
blob
|
commitdiff
|
raw
2011-04-27
Junio C Hamano
Merge branch 'mg/x-years-12-months'
blob
|
commitdiff
|
raw
2011-04-27
Junio C Hamano
Merge branch 'ef/maint-strbuf-init'
blob
|
commitdiff
|
raw
2011-04-25
Junio C Hamano
Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
blob
|
commitdiff
|
raw
|
diff to current
2011-04-11
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2011-04-03
Junio C Hamano
Merge branch 'jc/index-update-if-able' into maint
blob
|
commitdiff
|
raw
2011-04-03
Junio C Hamano
Merge branch 'jc/maint-rev-list-culled-boundary' into...
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'nd/index-doc' into maint
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'jc/maint-diff-q-filter' into maint
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'mg/doc-bisect-tweak-worktree' into maint
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'jh/maint-do-not-track-non-branches' into...
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge "checkout ambiguous ref bugfix" into maint
blob
|
commitdiff
|
raw
2011-03-27
Junio C Hamano
Merge branch 'jc/index-update-if-able'
blob
|
commitdiff
|
raw
2011-03-27
Junio C Hamano
Merge branch 'jc/maint-rerere-in-workdir'
blob
|
commitdiff
|
raw
2011-03-27
Junio C Hamano
Merge branch 'nd/index-doc'
blob
|
commitdiff
|
raw
2011-03-26
Junio C Hamano
Merge git-gui 0.14.0
blob
|
commitdiff
|
raw
2011-03-23
Junio C Hamano
Merge branch 'jc/maint-diff-q-filter'
blob
|
commitdiff
|
raw
2011-03-23
Junio C Hamano
Merge branch 'mg/doc-bisect-tweak-worktree'
blob
|
commitdiff
|
raw
2011-03-23
Junio C Hamano
Merge branch 'jc/maint-rev-list-culled-boundary'
blob
|
commitdiff
|
raw
2011-03-21
Junio C Hamano
Merge branch 'ae/better-template-failure-report' into...
blob
|
commitdiff
|
raw
2011-03-16
Junio C Hamano
Merge branch 'jn/maint-commit-missing-template' into...
blob
|
commitdiff
|
raw
2011-03-16
Junio C Hamano
Merge branch 'jk/diffstat-binary' into maint
blob
|
commitdiff
|
raw
2011-03-16
Junio C Hamano
Merge branch 'jn/test-terminal-punt-on-osx-breakage...
blob
|
commitdiff
|
raw
2011-03-15
Junio C Hamano
Merge branch 'jh/maint-do-not-track-non-branches'
blob
|
commitdiff
|
raw
2011-03-14
Junio C Hamano
Merge branch 'sp/maint-smart-http-sans-100-continue'
blob
|
commitdiff
|
raw
2011-03-04
Junio C Hamano
Merge branch 'jn/maint-commit-missing-template'
blob
|
commitdiff
|
raw
2011-03-04
Junio C Hamano
Merge branch 'jk/diffstat-binary'
blob
|
commitdiff
|
raw
2011-03-04
Junio C Hamano
Merge branch 'jn/test-terminal-punt-on-osx-breakage'
blob
|
commitdiff
|
raw
2011-02-28
Junio C Hamano
Merge branch 'mz/rerere-remaining'
blob
|
commitdiff
|
raw
2011-02-28
Junio C Hamano
Merge branch 'uk/checkout-ambiguous-ref'
blob
|
commitdiff
|
raw
2011-02-28
Junio C Hamano
Merge branch 'sp/maint-smart-http-sans-100-continue'
blob
|
commitdiff
|
raw
2011-02-28
Junio C Hamano
Merge branch 'hv/mingw-fs-funnies'
blob
|
commitdiff
|
raw
2011-02-26
Jonathan Nieder
Merge commit 'jn/svn-fe' of git://github.com/gitster...
blob
|
commitdiff
|
raw
2011-02-16
Junio C Hamano
Merge branch 'maint-1.7.3' into maint
blob
|
commitdiff
|
raw
2011-02-16
Junio C Hamano
Merge branch 'maint-1.7.2' into maint-1.7.3
blob
|
commitdiff
|
raw
|
diff to current
2011-02-16
Junio C Hamano
Merge branch 'maint-1.7.1' into maint-1.7.2
blob
|
commitdiff
|
raw
|
diff to current
2011-02-16
Junio C Hamano
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
commitdiff
|
raw
|
diff to current
2011-02-10
Junio C Hamano
Merge branch 'tr/merge-unborn-clobber'
blob
|
commitdiff
|
raw
2011-02-10
Junio C Hamano
Merge branch 'jc/unpack-trees'
blob
|
commitdiff
|
raw
2011-02-10
Junio C Hamano
Merge branch 'tr/diff-words-test'
blob
|
commitdiff
|
raw
2011-02-10
Junio C Hamano
Merge branch 'rr/fi-import-marks-if-exists'
blob
|
commitdiff
|
raw
2011-02-10
Junio C Hamano
Merge branch 'jn/unpack-lstat-failure-report'
blob
|
commitdiff
|
raw
2011-02-10
Junio C Hamano
Merge branch 'ef/alias-via-run-command'
blob
|
commitdiff
|
raw
2011-02-10
Junio C Hamano
Merge branch 'cb/setup'
blob
|
commitdiff
|
raw
2011-02-10
Junio C Hamano
Merge branch 'ae/better-template-failure-report'
blob
|
commitdiff
|
raw
2011-02-10
Junio C Hamano
Merge branch 'jn/cherry-pick-strategy-option'
blob
|
commitdiff
|
raw
2011-02-10
Junio C Hamano
Merge branch 'maint-1.7.0' into maint
blob
|
commitdiff
|
raw
2011-01-31
Junio C Hamano
Merge branch 'jl/fetch-submodule-recursive' into maint
blob
|
commitdiff
|
raw
2011-01-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-01-27
Junio C Hamano
Merge branch 'jn/fast-import-empty-tree-removal' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-01-24
Junio C Hamano
Merge branch 'as/userdiff-pascal'
blob
|
commitdiff
|
raw
2011-01-24
Junio C Hamano
Merge branch 'jn/setup-fixes'
blob
|
commitdiff
|
raw
2011-01-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-01-19
Junio C Hamano
Merge branch 'jk/diff-driver-binary-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-01-19
Junio C Hamano
Merge branch 'tr/submodule-relative-scp-url' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-01-19
Junio C Hamano
Merge branch 'jn/maint-fast-import-object-reuse' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-01-19
Junio C Hamano
Merge branch 'nd/maint-relative' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-01-16
Jonathan Nieder
ll-merge: simplify opts == NULL case
blob
|
commitdiff
|
raw
2011-01-13
Junio C Hamano
Merge branch 'jn/gitweb-no-logo'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-13
Junio C Hamano
Merge branch 'jk/diff-driver-binary-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-13
Junio C Hamano
Merge branch 'tr/submodule-relative-scp-url'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-10
Junio C Hamano
Merge branch 'maint-1.7.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-01-10
Junio C Hamano
Merge branch 'maint-1.7.1' into maint-1.7.2
blob
|
commitdiff
|
raw
|
diff to current
2011-01-10
Junio C Hamano
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
commitdiff
|
raw
|
diff to current
2011-01-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-05
Junio C Hamano
Merge branch 'maint' to sync with 1.7.3.5
blob
|
commitdiff
|
raw
|
diff to current
2011-01-05
Junio C Hamano
Merge branch 'mg/cvsimport'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-28
Junio C Hamano
Merge branch 'jc/maint-rebase-rewrite-last-skip'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-26
Junio C Hamano
Merge branch 'rs/maint-diff-fd-leak' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-12-23
Junio C Hamano
Merge branch 'rj/maint-difftool-cygwin-workaround'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
