Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Add map_user() and clear_mailmap() to mailmap
[gitweb.git]
/
Documentation
/
merge-config.txt
2009-02-04
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-02-04
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-02-03
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-02-01
Merge branch 'ks/maint-mailinfo-folded'
blob
|
diff
|
raw
2009-02-01
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-01-29
Merge branch 'jc/maint-format-patch-o-relative' into...
blob
|
diff
|
raw
2009-01-29
Merge branch 'bs/maint-rename-populate-filespec' into...
blob
|
diff
|
raw
2009-01-29
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-01-27
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-01-27
Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into...
blob
|
diff
|
raw
2009-01-26
Merge branch 'js/maint-all-implies-HEAD'
blob
|
diff
|
raw
2009-01-24
Merge branch 'cb/maint-unpack-trees-absense' into maint
blob
|
diff
|
raw
2009-01-24
Merge branch 'tr/maint-no-index-fixes' into maint
blob
|
diff
|
raw
2009-01-24
Merge branch 'jc/maint-format-patch' into maint
blob
|
diff
|
raw
2009-01-24
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-01-22
Merge branch 'kc/maint-diff-bwi-fix'
blob
|
diff
|
raw
2009-01-22
Merge branch 'lt/maint-wrap-zlib'
blob
|
diff
|
raw
2009-01-22
Merge branch 'sg/maint-gitdir-in-subdir'
blob
|
diff
|
raw
2009-01-22
Merge branch 'jc/maint-format-patch-o-relative'
blob
|
diff
|
raw
2009-01-21
Merge branch 'bs/maint-rename-populate-filespec'
blob
|
diff
|
raw
2009-01-20
Merge branch 'kc/maint-diff-bwi-fix'
blob
|
diff
|
raw
2009-01-18
Merge branch 'ds/uintmax-config'
blob
|
diff
|
raw
2009-01-18
Merge branch 'gb/gitweb-patch'
blob
|
diff
|
raw
2009-01-18
Merge branch 'jc/maint-format-patch'
blob
|
diff
|
raw
2009-01-18
Merge branch 'tr/maint-no-index-fixes'
blob
|
diff
|
raw
2009-01-18
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-01-15
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-01-15
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-01-14
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-01-14
Merge branch 'js/bundle-tags'
blob
|
diff
|
raw
2009-01-14
Merge branch 'cb/maint-unpack-trees-absense'
blob
|
diff
|
raw
2009-01-13
Merge branch 'cb/maint-merge-recursive-fix' into maint
blob
|
diff
|
raw
2009-01-13
Merge branch 'ap/maint-apply-modefix' into maint
blob
|
diff
|
raw
2009-01-13
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-01-12
Merge branch 'jc/maint-do-not-switch-to-non-commit...
blob
|
diff
|
raw
2009-01-07
Merge branch 'jn/gitweb-blame'
blob
|
diff
|
raw
2009-01-07
Merge branch 'wp/add-p-goto'
blob
|
diff
|
raw
2009-01-07
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-01-07
Merge branch 'maint-1.5.6' into maint-1.6.0
blob
|
diff
|
raw
|
diff to current
2009-01-03
Merge branch 'jc/maint-do-not-switch-to-non-commit'
blob
|
diff
|
raw
2009-01-03
Merge branch 'ap/maint-apply-modefix'
blob
|
diff
|
raw
2009-01-01
Merge branch 'cb/mergetool'
blob
|
diff
|
raw
2008-12-29
Merge branch 'lt/reset-merge'
blob
|
diff
|
raw
2008-12-27
Merge branch 'sp/maint-describe-all-tag-warning' into...
blob
|
diff
|
raw
2008-12-22
Merge branch 'maint'
blob
|
diff
|
raw
2008-12-22
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2008-12-20
Merge branch 'maint' to sync with GIT 1.6.0.6
blob
|
diff
|
raw
2008-12-20
GIT 1.6.0.6
v1.6.0.6
blob
|
diff
|
raw
|
diff to current
2008-12-18
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2008-12-17
GIT 1.5.6.6
v1.5.6.6
blob
|
diff
|
raw
|
diff to current
2008-12-16
Merge branch 'maint'
blob
|
diff
|
raw
2008-12-15
Merge branch 'cb/maint-merge-recursive-fix' into cb...
blob
|
diff
|
raw
2008-12-13
Merge branch 'maint'
blob
|
diff
|
raw
2008-12-11
Merge branch 'maint'
blob
|
diff
|
raw
2008-12-10
Merge branch 'maint'
blob
|
diff
|
raw
2008-12-10
Improve language in git-merge.txt and related docs
blob
|
diff
|
raw
2008-12-07
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-12-03
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-12-03
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-12-02
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-12-02
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-12-01
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-12-01
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-12-01
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-11-29
Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
blob
|
diff
|
raw
|
diff to current
2008-11-28
Merge branch 'cc/bisect-skip'
blob
|
diff
|
raw
|
diff to current
2008-11-28
Merge branch 'js/mingw-rename-fix'
blob
|
diff
|
raw
|
diff to current
2008-11-28
Merge branch 'st/levenshtein'
blob
|
diff
|
raw
|
diff to current
2008-11-28
Merge branch 'cr/remote-update-v'
blob
|
diff
|
raw
|
diff to current
2008-11-28
Merge branch 'rs/strbuf-expand'
blob
|
diff
|
raw
|
diff to current
2008-11-28
Merge branch 'mv/clone-strbuf'
blob
|
diff
|
raw
|
diff to current
2008-11-28
Merge branch 'lt/preload-lstat'
blob
|
diff
|
raw
|
diff to current
2008-11-28
Merge branch 'ta/quiet-pull'
blob
|
diff
|
raw
|
diff to current
2008-11-28
Merge branch 'ph/send-email'
blob
|
diff
|
raw
|
diff to current
2008-11-28
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-11-27
Merge branch 'rw/maint-typofix' into rw/typofix
blob
|
diff
|
raw
|
diff to current
2008-11-26
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-11-26
Merge branch 'mm/sort-config-doc'
blob
|
diff
|
raw
|
diff to current
2008-11-26
Merge branch 'mm/maint-sort-config-doc' into mm/sort...
blob
|
diff
|
raw
|
diff to current
2008-11-16
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-11-13
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-11-13
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-11-02
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-11-02
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2008-10-21
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-10-18
Merge branch 'pb/commit-where'
blob
|
diff
|
raw
|
diff to current
2008-10-09
Merge branch 'lt/time-reject-fractional-seconds'
blob
|
diff
|
raw
|
diff to current
2008-10-09
Merge branch 'jc/add-ita'
blob
|
diff
|
raw
|
diff to current
2008-09-29
Merge branch 'jc/better-conflict-resolution'
blob
|
diff
|
raw
|
diff to current
2008-09-25
Merge branch 'mv/merge-recursive'
blob
|
diff
|
raw
|
diff to current
2008-09-25
Merge branch 'jc/alternate-push'
blob
|
diff
|
raw
|
diff to current
2008-09-25
Merge branch 'am/status'
blob
|
diff
|
raw
|
diff to current
2008-09-25
Merge branch 'pb/autocorrect-wrapper'
blob
|
diff
|
raw
|
diff to current
2008-09-25
Merge branch 'mv/commit-tree'
blob
|
diff
|
raw
|
diff to current
2008-09-25
Merge branch 'jc/apply-include-exclude'
blob
|
diff
|
raw
|
diff to current
2008-09-25
Merge branch 'jc/safe-c-l-d'
blob
|
diff
|
raw
|
diff to current
2008-09-25
Merge branch 'ho/dirstat-by-file'
blob
|
diff
|
raw
|
diff to current
2008-09-25
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-09-19
Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
blob
|
diff
|
raw
|
diff to current
2008-09-19
Merge branch 'jc/diff-prefix'
blob
|
diff
|
raw
|
diff to current
next