projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Fix up docs where "--" isn't displayed correctly.
[git]
/
git-merge.sh
2006-05-03
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-04-24
Junio C Hamano
Merge branch 'sh/daemon'
blob
|
commitdiff
|
raw
2006-04-24
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-04-19
Junio C Hamano
Merge branch 'lt/xsha1'
blob
|
commitdiff
|
raw
2006-04-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-04-19
Junio C Hamano
git-merge: a bit more readable user guidance.
blob
|
commitdiff
|
raw
2006-04-17
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-05
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-05
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-04
Junio C Hamano
Merge branch 'lt/fix-sol-pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-04
Junio C Hamano
Merge branch 'lt/fix-sol-pack' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-04-02
Junio C Hamano
Merge branch 'lt/fix-sol-pack' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-31
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-03-28
Junio C Hamano
Merge branch ak/svn
blob
|
commitdiff
|
raw
|
diff to current
2006-03-27
Junio C Hamano
Merge branch 'lt/diffgen' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
Junio C Hamano
Merge branches 'jc/clone' and 'jc/name'
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
Junio C Hamano
Merge branch 'jc/merge'
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
Junio C Hamano
Merge branch 'lt/diffgen' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
Junio C Hamano
Merge branch 'ew/email' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
Junio C Hamano
Merge branch 'lt/diffgen' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
Junio C Hamano
Merge branch 'rs/tar-tree' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-24
Junio C Hamano
Merge branch 'jc/name' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-22
Junio C Hamano
Merge branch 'jc/pull' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-22
Junio C Hamano
Merge branch 'jc/revlist' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-22
Junio C Hamano
Merge branch 'jc/clone' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-21
Junio C Hamano
Merge branch 'jc/clone' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-21
Junio C Hamano
Merge branch 'jc/name' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-21
Junio C Hamano
Merge branch 'jc/name' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-21
Junio C Hamano
Merge branch 'jc/clone' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-20
Junio C Hamano
Merge branch 'jc/merge' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-20
Junio C Hamano
git-merge knows some strategies want to skip trivial...
blob
|
commitdiff
|
raw
|
diff to current
2006-03-15
Junio C Hamano
Merge branch 'lt/diff' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-15
Junio C Hamano
Merge branch 'lt/diff' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-13
Junio C Hamano
Merge branch 'jc/pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-03-13
Junio C Hamano
Merge branch 'jc/fsck'
blob
|
commitdiff
|
raw
|
diff to current
2006-03-13
Junio C Hamano
Merge branch 'jc/diff' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-13
Junio C Hamano
Merge branch 'jc/diff' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-13
Junio C Hamano
Merge branch 'jc/diff' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-12
Junio C Hamano
Merge branch 'jc/diff' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-11
Junio C Hamano
Merge branch 'fk/blame' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-10
Olaf Hering
allow double click on current HEAD id after git-pull
blob
|
commitdiff
|
raw
|
diff to current
2006-03-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-03-02
Junio C Hamano
Merge part of 'lt/rev-list' into 'fk/blame'
blob
|
commitdiff
|
raw
|
diff to current
2006-03-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-03-02
Junio C Hamano
Merge branch 'jc/tag'
blob
|
commitdiff
|
raw
|
diff to current
2006-03-02
Junio C Hamano
Merge branch 'jc/tag' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-02
Junio C Hamano
Up to date with GIT 1.2.4 fixes
blob
|
commitdiff
|
raw
|
diff to current
2006-03-02
Junio C Hamano
Merge early parts of 'np/delta' branch
blob
|
commitdiff
|
raw
|
diff to current
2006-03-01
Junio C Hamano
Merge git-mv fixes from 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-28
Junio C Hamano
Merge part of np/delta
blob
|
commitdiff
|
raw
|
diff to current
2006-02-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-25
Junio C Hamano
Merge branches 'jc/rev-list' and 'jc/pack-thin'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-25
Junio C Hamano
Merge branches 'jc/rev-list' and 'jc/pack-thin'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-24
Junio C Hamano
Merge fixes early for next maint series.
blob
|
commitdiff
|
raw
|
diff to current
2006-02-24
Junio C Hamano
Merge branch 'fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2006-02-24
Junio C Hamano
Merge branches 'jc/rev-list' and 'jc/pack-thin' into...
blob
|
commitdiff
|
raw
|
diff to current
2006-02-24
Junio C Hamano
Merge fix bits from jc/rev-list
blob
|
commitdiff
|
raw
|
diff to current
2006-02-24
Junio C Hamano
Merge branch 'np/delta' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-24
Junio C Hamano
Merge branch 'ar/win'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-24
Junio C Hamano
Merge branch 'jc/send-insane-refs'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-24
Junio C Hamano
Merge fixes early for next maint series.
blob
|
commitdiff
|
raw
|
diff to current
2006-02-24
Junio C Hamano
Merge branches 'jc/fix-co-candy', 'jc/fix-rename-leak...
blob
|
commitdiff
|
raw
|
diff to current
2006-02-23
Junio C Hamano
Merge part of pack-thin branch
blob
|
commitdiff
|
raw
|
diff to current
2006-02-23
Junio C Hamano
Merge branch 'np/delta' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-23
Junio C Hamano
Merge branches 'maint', 'jc/fix-co-candy' and 'jc/fix...
blob
|
commitdiff
|
raw
|
diff to current
2006-02-23
Junio C Hamano
Merge branch 'ra/anno'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-23
Junio C Hamano
checkout - eye candy.
blob
|
commitdiff
|
raw
|
diff to current
2006-02-23
Junio C Hamano
Merge fixes up to GIT 1.2.3
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Keep Porcelainish from failing by broken ident after...
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge branch 'ra/anno' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge branch 'jc/perl'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge branch 'jc/pack-reuse'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge branch 'jc/nostat'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge branch 'js/portable'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-21
Junio C Hamano
Merge part of jc/portable branch
blob
|
commitdiff
|
raw
|
diff to current
2006-02-21
Junio C Hamano
Merge branch 'lt/merge-tree'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-21
Junio C Hamano
Merge branch 'jc/ident'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-20
Junio C Hamano
Merge branch 'jc/perl' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-20
Junio C Hamano
Merge branch 'ra/anno' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-20
Junio C Hamano
Merge branch 'jc/pack-thin' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-20
Junio C Hamano
Merge branch 'jc/pack-thin' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-20
Junio C Hamano
Merge branch 'jc/rev-list' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-20
Junio C Hamano
Merge branch 'js/portable' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-20
Junio C Hamano
Merge branch 'jc/merge-msg' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-19
Junio C Hamano
Merge branch 'jc/mv' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-19
Junio C Hamano
Merge part of js/portable into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-19
Johannes Schindelin
Optionally work without python
blob
|
commitdiff
|
raw
|
diff to current
2006-02-19
Junio C Hamano
Merge branch 'jc/ident' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-19
Junio C Hamano
Keep Porcelainish from failing by broken ident after...
blob
|
commitdiff
|
raw
|
diff to current
2006-02-13
Junio C Hamano
Merge branch 'jc/nostat'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-12
Junio C Hamano
Merge branch 'master'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-12
Junio C Hamano
Only call git-rerere if $GIT_DIR/rr-cache exists.
blob
|
commitdiff
|
raw
|
diff to current
2006-02-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-02-07
Junio C Hamano
git-rerere: reuse recorded resolve.
blob
|
commitdiff
|
raw
|
diff to current
2006-02-04
Junio C Hamano
Merge branches 'jc/sha1', 'jc/diff' and 'jc/ws'
blob
|
commitdiff
|
raw
|
diff to current
next
projects / git / history
Junio C Hamano
Olaf Hering
Johannes Schindelin