projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
fast-import: Fail if a non-existant commit is used for merge
[git]
/
git-pull.sh
2007-02-25
Junio C Hamano
Merge git://repo.or.cz/git-gui into maint
blob
|
commitdiff
|
raw
2007-02-21
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
2007-02-18
Junio C Hamano
Merge git://git./pub/scm/gitk/gitk into maint
blob
|
commitdiff
|
raw
2007-02-13
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2007-02-13
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2007-02-12
Junio C Hamano
Merge git-gui
blob
|
commitdiff
|
raw
2007-01-31
Junio C Hamano
Merge branch 'master' of git://linux-nfs.org/~bfields/git
blob
|
commitdiff
|
raw
2007-01-30
Shawn O. Pearce
Merge branch 'master' into sp/gfi
blob
|
commitdiff
|
raw
2007-01-15
Jeff King
git-pull: disallow implicit merging to detached HEAD
blob
|
commitdiff
|
raw
2007-01-15
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-01-15
J. Bruce Fields
Merge branch 'master' of git://git./git/git
blob
|
commitdiff
|
raw
|
diff to current
2007-01-14
Junio C Hamano
Merge branch 'jc/int'
blob
|
commitdiff
|
raw
|
diff to current
2007-01-14
Junio C Hamano
Merge branch 'sp/merge' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2007-01-14
Junio C Hamano
Merge branch 'jc/subdir'
blob
|
commitdiff
|
raw
|
diff to current
2007-01-14
Shawn O. Pearce
Merge branch 'master' into sp/fast-import
blob
|
commitdiff
|
raw
|
diff to current
2007-01-13
Junio C Hamano
Allow whole-tree operations to be started from a subdir...
blob
|
commitdiff
|
raw
|
diff to current
2007-01-12
Junio C Hamano
Merge branch 'jc/bare'
blob
|
commitdiff
|
raw
|
diff to current
2007-01-10
Shawn O. Pearce
Disallow working directory commands in a bare repository.
blob
|
commitdiff
|
raw
|
diff to current
2007-01-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-01-07
Junio C Hamano
Merge branch 'sp/mmap'
blob
|
commitdiff
|
raw
|
diff to current
2007-01-05
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-01-01
Junio C Hamano
Merge branch 'sp/merge' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2007-01-01
Junio C Hamano
fail pull/merge early in the middle of conflicted merge
blob
|
commitdiff
|
raw
|
diff to current
2006-12-29
Junio C Hamano
Merge branch 'jc/curl'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-29
Junio C Hamano
Merge branch 'jc/utf8'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-29
Junio C Hamano
Merge branch 'jc/make'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-28
Junio C Hamano
Merge branch 'js/shallow'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-28
Shawn O. Pearce
Allow git-merge to select the default strategy.
blob
|
commitdiff
|
raw
|
diff to current
2006-12-28
Shawn O. Pearce
Ensure `git-pull` fails if `git-merge` fails.
blob
|
commitdiff
|
raw
|
diff to current
2006-12-28
Shawn O. Pearce
Use GIT_REFLOG_ACTION environment variable instead.
blob
|
commitdiff
|
raw
|
diff to current
2006-12-27
Junio C Hamano
Merge branch 'master' into js/shallow
blob
|
commitdiff
|
raw
|
diff to current
2006-12-25
Junio C Hamano
Merge branch 'jc/skip-count'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-25
Junio C Hamano
Merge branch 'jc/git-add--interactive'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-21
Junio C Hamano
Merge branch 'ew/svn-pm'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-20
Junio C Hamano
Merge branch 'jc/leftright'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-20
Junio C Hamano
Merge branch 'jc/blame'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-20
Junio C Hamano
Merge branch 'jc/branch-remove-remote'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-20
Junio C Hamano
Merge branch 'jc/clone'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-19
Josef Weidendorfer
Move "no merge candidate" warning into git-pull
blob
|
commitdiff
|
raw
|
diff to current
2006-11-29
Junio C Hamano
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-11-24
Junio C Hamano
Merge branch 'jc/numstat'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-24
Junio C Hamano
Merge branch 'jc/upload-pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-17
Linus Torvalds
git-pull: allow pulling into an empty repository
blob
|
commitdiff
|
raw
|
diff to current
2006-11-08
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-11-01
Junio C Hamano
Merge branch 'jc/refs-and-fetch'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-01
Junio C Hamano
Merge branch 'lj/refs'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-25
Junio C Hamano
Merge branch 'aw/cvsimport'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-25
Junio C Hamano
Merge for-each-ref to sync gitweb fully with 'next'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-25
Junio C Hamano
Merge branch 'jc/web-blame'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-24
Junio C Hamano
Merge branch 'master' into jc/web
blob
|
commitdiff
|
raw
|
diff to current
2006-10-23
Junio C Hamano
Merge branch 'np/pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'mw/pathinfo'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'js/diff'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'jc/send-email'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'jc/grep'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge early part of branch 'jc/diff-apply-patch'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'rs/rebase'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'sb/fetch'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'sk/svn'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-19
Junio C Hamano
Merge branch 'rs/zip'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-15
Junio C Hamano
Merge branch 'jc/http'
v1.4.3-rc3
blob
|
commitdiff
|
raw
|
diff to current
2006-10-11
Junio C Hamano
git-pull: we say commit X, not X commit.
blob
|
commitdiff
|
raw
|
diff to current
2006-09-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'jc/upload-pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'th/diff-extra'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
GIT 1.4.2
v1.4.2
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-08-08
Junio C Hamano
Merge branch 'master' into pb/gitpm
blob
|
commitdiff
|
raw
|
diff to current
2006-07-31
Junio C Hamano
Merge branch 'js/read-tree' into js/c-merge-recursive
blob
|
commitdiff
|
raw
|
diff to current
2006-07-30
Junio C Hamano
Merge branch 'jn/make'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-26
Junio C Hamano
Merge branch 'pb/configure'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-25
Junio C Hamano
Merge branch 'jc/clone-bind-failure'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-25
Junio C Hamano
Merge branch 'jt/format-patch'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-25
Junio C Hamano
Merge branch 'ew/apply'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-25
Junio C Hamano
Merge branch 'jc/read-tree'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-25
Junio C Hamano
Merge branch 'lt/objformat'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-17
Junio C Hamano
Merge branch 'sp/reflog'
v1.4.2-rc1
blob
|
commitdiff
|
raw
|
diff to current
2006-07-13
Junio C Hamano
Merge branch 'ml/trace'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-13
Junio C Hamano
Merge branch 'js/merge-base'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-13
Junio C Hamano
Merge branch 'lt/prune'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-13
Junio C Hamano
Merge branch 'lt/merge-tree'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-11
Shawn Pearce
Log ref changes made by git-merge and git-pull.
blob
|
commitdiff
|
raw
|
diff to current
2006-07-11
Shawn Pearce
Log ref changes made by git-fetch and git-pull.
blob
|
commitdiff
|
raw
|
diff to current
2006-07-05
Junio C Hamano
Merge branch 'jc/sha1'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-05
Junio C Hamano
Merge branch 'jc/diff-test'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-05
Junio C Hamano
Merge branch 'th/diff'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-29
Junio C Hamano
Merge branch 'jc/repack'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-29
Junio C Hamano
Merge branch 'js/patch'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-27
Dennis Stosberg
Fix expr usage for FreeBSD
blob
|
commitdiff
|
raw
|
diff to current
2006-06-26
Junio C Hamano
Merge branch 'jc/squash'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-26
Junio C Hamano
Merge branch 'js/diff'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-24
Junio C Hamano
git-merge --squash
blob
|
commitdiff
|
raw
|
diff to current
2006-06-24
Junio C Hamano
git-pull: abort when fmt-merge-msg fails.
blob
|
commitdiff
|
raw
|
diff to current
2006-06-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-06-10
Junio C Hamano
Merge git://git.kernel.org/pub/scm/git/gitweb
blob
|
commitdiff
|
raw
|
diff to current
2006-06-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-06-04
Junio C Hamano
Merge branch 'new' of git://git./gitk/gitk into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
next