Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Retire git-runstatus for real.
[gitweb.git]
/
Documentation
/
git-merge.txt
2007-12-09
Merge branch 'maint'
blob
|
diff
|
raw
2007-12-07
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
2007-12-07
Merge branch 'maint'
blob
|
diff
|
raw
2007-12-06
Merge branch 'maint'
blob
|
diff
|
raw
2007-12-02
Merge branch 'maint'
blob
|
diff
|
raw
2007-12-01
Merge 1.5.3.7 in
blob
|
diff
|
raw
2007-12-01
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-29
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-26
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-25
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-23
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-23
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-21
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2007-11-21
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-19
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-18
Merge branch 'maint' to synchronize with 1.5.3.6
blob
|
diff
|
raw
2007-11-17
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-14
Merge branch 'bs/maint-commit-options'
blob
|
diff
|
raw
2007-11-14
Merge branch 'rv/maint-index-commit'
blob
|
diff
|
raw
2007-11-14
Merge branch 'bs/maint-t7005'
blob
|
diff
|
raw
2007-11-14
Merge branch 'jc/maint-add-sync-stat'
blob
|
diff
|
raw
2007-11-14
Merge branch 'jc/stash-create'
blob
|
diff
|
raw
2007-11-14
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-12
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-12
Merge branch 'sp/maint-plug-traverse-commit-list-leak...
blob
|
diff
|
raw
2007-11-11
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-10
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-09
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-08
Merge branch 'jc/clean-config'
blob
|
diff
|
raw
2007-11-08
Merge branch 'ds/maint-deflatebound'
blob
|
diff
|
raw
2007-11-08
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-06
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-04
Merge branch 'jc/revert-merge'
blob
|
diff
|
raw
2007-11-04
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-02
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-02
Merge branch 'ph/parseopt'
blob
|
diff
|
raw
2007-11-02
Merge branch 'np/progress'
blob
|
diff
|
raw
2007-11-02
Merge branch 'gp/maint-diffdoc'
blob
|
diff
|
raw
2007-11-02
Merge branch 'maint'
blob
|
diff
|
raw
2007-11-01
Merge branch 'bk/maint-cvsexportcommit'
blob
|
diff
|
raw
2007-11-01
Merge branch 'js/forkexec'
blob
|
diff
|
raw
2007-11-01
Merge branch 'sp/mergetool'
blob
|
diff
|
raw
2007-11-01
Merge branch 'sp/help'
blob
|
diff
|
raw
2007-11-01
Merge branch 'kh/commit'
blob
|
diff
|
raw
2007-10-31
Merge branch 'maint' to catch up with 1.5.3.5
blob
|
diff
|
raw
2007-10-31
Merge branch 'maint' into HEAD
blob
|
diff
|
raw
2007-10-30
git-merge: document but discourage the historical syntax
blob
|
diff
|
raw
|
diff to current
2007-10-29
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-10-28
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-10-27
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-10-21
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-10-21
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-10-21
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-10-19
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-10-19
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-10-18
Merge branch 'jc/am-quiet'
blob
|
diff
|
raw
|
diff to current
2007-10-18
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-10-18
Merge branch 'lt/diff-rename'
blob
|
diff
|
raw
|
diff to current
2007-10-17
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-10-16
Merge branch 'master' into db/fetch-pack
blob
|
diff
|
raw
|
diff to current
2007-10-16
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-10-03
Merge branch 'mv/unknown'
blob
|
diff
|
raw
|
diff to current
2007-10-03
Merge branch 'ph/strbuf'
blob
|
diff
|
raw
|
diff to current
2007-10-03
Merge branch 'lh/merge'
blob
|
diff
|
raw
|
diff to current
2007-10-03
Merge branch 'js/rebase-i'
blob
|
diff
|
raw
|
diff to current
2007-10-03
Merge branch 'jc/autogc'
blob
|
diff
|
raw
|
diff to current
2007-09-29
Merge branch 'gr/smtp'
blob
|
diff
|
raw
|
diff to current
2007-09-29
Merge branch 'ss/svnimport'
blob
|
diff
|
raw
|
diff to current
2007-09-29
Merge branch 'sv/svn'
blob
|
diff
|
raw
|
diff to current
2007-09-29
Merge branch 'ml/submodule'
blob
|
diff
|
raw
|
diff to current
2007-09-29
Merge branch 'jb/remote-rm'
blob
|
diff
|
raw
|
diff to current
2007-09-29
Merge branch 'jk/diff-rename'
blob
|
diff
|
raw
|
diff to current
2007-09-29
Sync with GIT 1.5.3.3
blob
|
diff
|
raw
|
diff to current
2007-09-26
Fix spelling of overridden in documentation
blob
|
diff
|
raw
|
diff to current
2007-09-24
git-merge: add support for branch.<name>.mergeoptions
blob
|
diff
|
raw
|
diff to current
2007-09-18
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-08-29
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-08-27
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-08-26
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-08-21
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-08-19
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-08-19
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-08-16
Merge branch 'maint' to sync with 1.5.2.5
blob
|
diff
|
raw
|
diff to current
2007-08-13
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-08-11
Merge branch 'cr/tag'
blob
|
diff
|
raw
|
diff to current
2007-08-06
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-08-05
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-08-02
Try to be consistent with capitalization in the documen...
blob
|
diff
|
raw
|
diff to current
2007-08-01
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-07-30
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-07-28
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-07-19
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-07-15
Merge branch 'master' of git://repo.or.cz/git/fastimport
blob
|
diff
|
raw
|
diff to current
2007-07-14
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-07-13
Update git-merge documentation.
blob
|
diff
|
raw
|
diff to current
2007-07-12
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-07-12
Merge commit 'git-gui/master'
blob
|
diff
|
raw
|
diff to current
2007-07-12
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-07-12
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-07-10
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
next