projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Documentation: talk about guts of merge in tutorial.
[git]
/
.gitignore
2005-11-03
Junio C Hamano
Add 'ours' merge strategy.
blob
|
commitdiff
|
raw
2005-10-28
Johannes Schindelin
Add more generated files to .gitignore
blob
|
commitdiff
|
raw
|
diff to current
2005-10-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-10-23
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-21
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-21
Johannes Schindelin
Make git-cherry-pick in target "all"
blob
|
commitdiff
|
raw
|
diff to current
2005-10-18
Johannes Schindelin
Ignore more generated files
blob
|
commitdiff
|
raw
|
diff to current
2005-10-18
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-17
Junio C Hamano
ref-format documentation.
blob
|
commitdiff
|
raw
|
diff to current
2005-10-16
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-16
Junio C Hamano
Merge branch 'svn' of netz.smurf.noris.de/git/git
blob
|
commitdiff
|
raw
|
diff to current
2005-10-15
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-15
Tom Prince
Add new programs and stamp file to .gitignore.
blob
|
commitdiff
|
raw
|
diff to current
2005-10-12
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-10
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-10
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-08
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-05
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-05
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-04
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-03
Peter Anvin
Merge with master.kernel.org:/pub/scm/git/git.git
blob
|
commitdiff
|
raw
|
diff to current
2005-10-03
Peter Anvin
Merge with master.kernel.org:/pub/scm/git/git.git
blob
|
commitdiff
|
raw
|
diff to current
2005-10-02
Junio C Hamano
Add git-symbolic-ref
blob
|
commitdiff
|
raw
|
diff to current
2005-09-30
H. Peter Anvin
Merge with master.kernel.org:/pub/scm/git/git.git
blob
|
commitdiff
|
raw
|
diff to current
2005-09-29
Peter Anvin
Merge with master.kernel.org:/pub/scm/git/git.git
blob
|
commitdiff
|
raw
|
diff to current
2005-09-29
Peter Anvin
Ignore *.exe files
blob
|
commitdiff
|
raw
|
diff to current
2005-09-29
Peter Anvin
Merge ... www.kernel.org/pub/scm/git/git.git
blob
|
commitdiff
|
raw
|
diff to current
2005-09-28
Tom Prince
[PATCH] Add new programs to .gitignore.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-09-25
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-09-24
Junio C Hamano
Really ignore generated distribution material.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-24
Junio C Hamano
Merge 'fixes' branch.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-23
Junio C Hamano
Ignore a bit more generated files.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-23
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-09-22
Junio C Hamano
Retire diff-helper.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-22
Junio C Hamano
Retire rev-tree.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-22
Junio C Hamano
Retire git-export.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-18
Junio C Hamano
Merge branch 'master' of .
blob
|
commitdiff
|
raw
|
diff to current
2005-09-17
Junio C Hamano
Add git-send-email to .gitignore
blob
|
commitdiff
|
raw
|
diff to current
2005-09-15
Junio C Hamano
Be more backward compatible with git-ssh-{push,pull}.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-15
Junio C Hamano
Retire info/rev-cache
blob
|
commitdiff
|
raw
|
diff to current
2005-09-14
Junio C Hamano
Merge branch 'master' of .
blob
|
commitdiff
|
raw
|
diff to current
2005-09-13
Fredrik Kuivinen
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-13
Junio C Hamano
Merge branch 'master' of .
blob
|
commitdiff
|
raw
|
diff to current
2005-09-13
Junio C Hamano
Document git-grep and link it from the main git(7)...
blob
|
commitdiff
|
raw
|
diff to current
2005-09-11
Junio C Hamano
Add a new merge strategy by Fredrik Kuivinen.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-09
Junio C Hamano
Adjust .gitignore for big rename.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-08
Junio C Hamano
Big tool rename.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-30
Junio C Hamano
Merge refs/heads/master from paulus
blob
|
commitdiff
|
raw
|
diff to current
2005-08-29
Junio C Hamano
Merge refs/heads/portable from cs.berkeley.edu/~ejr...
blob
|
commitdiff
|
raw
|
diff to current
2005-08-27
Junio C Hamano
Merge refs/heads/master from .
blob
|
commitdiff
|
raw
|
diff to current
2005-08-26
Tommi Virtanen
[PATCH] git bugfixes and cleanups, mainly Debian things
blob
|
commitdiff
|
raw
|
diff to current