tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Don't access line[-1] for a zero-length "line" from fgets.
[git.git]
/
git-merge.sh
2007-12-31
Junio C Hamano
Merge branch 'maint' of git://linux-nfs.org/~bfields/git
blob
|
commitdiff
|
raw
2007-12-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-12-09
Junio C Hamano
Merge branch 'jc/spht'
blob
|
commitdiff
|
raw
2007-12-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-12-07
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2007-12-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-12-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-12-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-12-02
Junio C Hamano
Merge branch 'tt/help'
blob
|
commitdiff
|
raw
2007-12-01
Junio C Hamano
Merge 1.5.3.7 in
blob
|
commitdiff
|
raw
2007-12-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-11-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-11-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-11-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-11-25
Junio C Hamano
Merge branch 'jk/send-pack'
blob
|
commitdiff
|
raw
2007-11-25
Junio C Hamano
Merge branch 'js/mingw-fallouts'
blob
|
commitdiff
|
raw
2007-11-25
Junio C Hamano
Merge branch 'mh/rebase-skip-hard'
blob
|
commitdiff
|
raw
2007-11-25
Junio C Hamano
Merge branch 'cc/bisect'
blob
|
commitdiff
|
raw
2007-11-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-11-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-11-21
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2007-11-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-11-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-11-19
Junio C Hamano
Merge branch 'lt/rev-list-gitlink'
blob
|
commitdiff
|
raw
2007-11-19
Junio C Hamano
Merge branch 'ds/checkout-upper'
blob
|
commitdiff
|
raw
2007-11-19
Junio C Hamano
Merge branch 'sh/p4'
blob
|
commitdiff
|
raw
2007-11-19
Junio C Hamano
Merge branch 'lt/rev-list-interactive'
blob
|
commitdiff
|
raw
2007-11-18
Junio C Hamano
Merge branch 'ph/diffopts'
blob
|
commitdiff
|
raw
2007-11-18
Junio C Hamano
Merge branch 'maint' to synchronize with 1.5.3.6
blob
|
commitdiff
|
raw
2007-11-18
Junio C Hamano
Merge branch 'ph/parseopt-sh'
blob
|
commitdiff
|
raw
2007-11-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Junio C Hamano
Merge branch 'sp/fetch-fix'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Junio C Hamano
Merge branch 'bs/maint-commit-options'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Junio C Hamano
Merge branch 'rv/maint-index-commit'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Junio C Hamano
Merge branch 'bs/maint-t7005'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Junio C Hamano
Merge branch 'jc/maint-add-sync-stat'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Junio C Hamano
Merge branch 'mh/retag'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Junio C Hamano
Merge branch 'jc/stash-create'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-12
Junio C Hamano
Merge branch 'sp/maint-plug-traverse-commit-list-leak...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-08
Junio C Hamano
Merge branch 'jc/clean-config'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-08
Junio C Hamano
Merge branch 'ds/maint-deflatebound'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-08
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-06
Pierre Habouzit
Migrate git-merge.sh to use git-rev-parse --parseopt
blob
|
commitdiff
|
raw
|
diff to current
2007-11-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-02
Junio C Hamano
Merge branch 'gp/maint-diffdoc'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-01
Junio C Hamano
Merge branch 'bk/maint-cvsexportcommit'
blob
|
commitdiff
|
raw
|
diff to current
2007-11-01
Junio C Hamano
git-merge: no reason to use cpio anymore
blob
|
commitdiff
|
raw
|
diff to current
2007-11-01
Junio C Hamano
Merge branch 'kh/commit'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-31
Junio C Hamano
Merge branch 'maint' to catch up with 1.5.3.5
blob
|
commitdiff
|
raw
|
diff to current
2007-10-31
Junio C Hamano
Merge branch 'maint' into HEAD
blob
|
commitdiff
|
raw
|
diff to current
2007-10-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-28
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-10-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-21
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-21
Shawn O. Pearce
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-10-21
Shawn O. Pearce
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-10-19
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-19
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-18
Shawn O. Pearce
Merge branch 'jc/am-quiet'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-18
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-18
Shawn O. Pearce
Merge branch 'lt/diff-rename'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-17
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-16
Shawn O. Pearce
Merge branch 'master' into db/fetch-pack
blob
|
commitdiff
|
raw
|
diff to current
2007-10-16
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-03
Junio C Hamano
Merge branch 'mv/unknown'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-03
Junio C Hamano
Merge branch 'ph/strbuf'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-03
Junio C Hamano
Merge branch 'lh/merge'
blob
|
commitdiff
|
raw
|
diff to current
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
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
