tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Fix some typos, punctuation, missing words, minor markup.
[git.git]
/
git-merge.sh
2007-10-03
Junio C Hamano
Merge branch 'mv/unknown'
blob
|
commitdiff
|
raw
2007-10-03
Junio C Hamano
Merge branch 'ph/strbuf'
blob
|
commitdiff
|
raw
2007-10-03
Junio C Hamano
Merge branch 'lh/merge'
blob
|
commitdiff
|
raw
2007-10-03
Junio C Hamano
Merge branch 'jc/autogc'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-03
Junio C Hamano
Sync with GIT 1.5.3.4
blob
|
commitdiff
|
raw
|
diff to current
2007-10-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-29
Junio C Hamano
Merge branch 'ss/svnimport'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-29
Junio C Hamano
Merge branch 'sv/svn'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-29
Junio C Hamano
Merge branch 'jb/remote-rm'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-29
Junio C Hamano
Sync with GIT 1.5.3.3
blob
|
commitdiff
|
raw
|
diff to current
2007-09-26
Junio C Hamano
Merge branch 'jc/autogc' into js/rebase-i
blob
|
commitdiff
|
raw
|
diff to current
2007-09-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-24
Junio C Hamano
Merge branch 'jn/web'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-24
Junio C Hamano
Merge branch 'je/hooks'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-24
Junio C Hamano
Merge branch 'js/apply-build-ancestor'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-24
Lars Hjemli
git-merge: add --ff and --no-ff options
blob
|
commitdiff
|
raw
|
diff to current
2007-09-24
Lars Hjemli
git-merge: add support for --commit and --no-squash
blob
|
commitdiff
|
raw
|
diff to current
2007-09-24
Lars Hjemli
git-merge: add support for branch.<name>.mergeoptions
blob
|
commitdiff
|
raw
|
diff to current
2007-09-24
Lars Hjemli
git-merge: refactor option parsing
blob
|
commitdiff
|
raw
|
diff to current
2007-09-24
Lars Hjemli
git-merge: fix faulty SQUASH_MSG
blob
|
commitdiff
|
raw
|
diff to current
2007-09-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-24
Junio C Hamano
Merge branch 'maint' of git://linux-nfs.org/~bfields...
blob
|
commitdiff
|
raw
|
diff to current
2007-09-23
David Kastrup
Supplant the "while case ... break ;; esac" idiom
blob
|
commitdiff
|
raw
|
diff to current
2007-09-19
Josh England
Add post-merge hook, related documentation, and tests.
blob
|
commitdiff
|
raw
|
diff to current
2007-09-18
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-09-06
Junio C Hamano
Invoke "git gc --auto" from commit, merge, am and rebase.
blob
|
commitdiff
|
raw
|
diff to current
2007-09-01
Junio C Hamano
Merge branch 'jp/send-email-cc'
blob
|
commitdiff
|
raw
|
diff to current
2007-08-29
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-08-28
Junio C Hamano
git-merge: do up-to-date check also for all strategies
blob
|
commitdiff
|
raw
|
diff to current
2007-08-27
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-08-26
J. Bruce Fields
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-08-21
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-08-19
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-08-19
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-08-16
Junio C Hamano
Merge branch 'maint' to sync with 1.5.2.5
blob
|
commitdiff
|
raw
|
diff to current
2007-08-13
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-08-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-08-05
J. Bruce Fields
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-08-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-30
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-07-28
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-07-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-14
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-07-12
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-07-12
Junio C Hamano
Merge commit 'git-gui/master'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-12
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-07-10
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-07
Junio C Hamano
Merge branch 'js/stash'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-07
Junio C Hamano
Merge branch 'jc/diff-mark'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-07
Johannes Schindelin
Enable "git rerere" by the config variable rerere.enabled
blob
|
commitdiff
|
raw
|
diff to current
2007-07-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-03
Junio C Hamano
Rewrite "git-frotz" to "git frotz"
blob
|
commitdiff
|
raw
|
diff to current
2007-07-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-02
Junio C Hamano
Merge 1.5.2.3 in
blob
|
commitdiff
|
raw
|
diff to current
2007-06-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-29
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-06-29
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-06-28
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-06-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-26
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk into...
blob
|
commitdiff
|
raw
|
diff to current
2007-06-22
Shawn O. Pearce
Import branch 'git-p4' of git://repo.or.cz/fast-export
blob
|
commitdiff
|
raw
|
diff to current
2007-06-16
Junio C Hamano
Merge branch 'maint' to sync with GIT 1.5.2.2
blob
|
commitdiff
|
raw
|
diff to current
2007-06-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-12
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-06-12
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-06-11
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-06-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-11
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-06-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-09
Junio C Hamano
Merge branch 'ar/clone'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-08
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-06
Junio C Hamano
Merge branch 'sv/objfixes'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-03
Junio C Hamano
Merge branch 'maint' to sync with 1.5.2.1
blob
|
commitdiff
|
raw
|
diff to current
2007-06-03
Junio C Hamano
Merge branches 'lh/submodules' and 'pb/am'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-02
Junio C Hamano
Merge branch 'sp/pack'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-31
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-31
Junio C Hamano
Merge branch 'maint-1.5.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2007-05-29
Junio C Hamano
Merge branch 'db/remote'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-29
Junio C Hamano
Merge branch 'dh/repack' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2007-05-29
Junio C Hamano
Merge branch 'np/delta'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-29
Junio C Hamano
Merge branch 'jc/nodelta'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-29
Junio C Hamano
Merge branch 'ar/verbose'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-29
Junio C Hamano
Merge branch 'ar/run'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-29
Junio C Hamano
Merge branch 'ar/mergestat'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-29
Junio C Hamano
Merge branch 'rr/cvsexport'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-29
Junio C Hamano
Merge branch 'maint-1.5.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2007-05-29
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-05-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-26
Junio C Hamano
Merge branch 'maint-1.5.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2007-05-26
Jeff King
More echo "$user_message" fixes.
blob
|
commitdiff
|
raw
|
diff to current
next