projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Merge refs/heads/master from .
[git]
/
git-resolve-script
2005-08-24
Junio C Hamano
Merge refs/heads/master from .
blob
|
commitdiff
|
raw
2005-08-24
Junio C Hamano
Try to find the optimum merge base while resolving.
blob
|
commitdiff
|
raw
2005-08-20
Junio C Hamano
Merge with master to pick up commit hook works.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-20
Junio C Hamano
git-resolve: dying is good, not showing help is bad.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-19
Junio C Hamano
Merge from gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-08-18
Junio C Hamano
Merge with gitk --parents change.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-18
Junio C Hamano
Merge with gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-08-14
Junio C Hamano
Merge master into rc
blob
|
commitdiff
|
raw
|
diff to current
2005-08-14
Linus Torvalds
[PATCH] Make sure git-resolve-script always works on...
blob
|
commitdiff
|
raw
|
diff to current
2005-08-12
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-10
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-09
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-08
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-07
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-06
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-05
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-07-31
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-07-29
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-07-23
Junio C Hamano
[PATCH] Audit rev-parse users.
blob
|
commitdiff
|
raw
|
diff to current
2005-07-18
Linus Torvalds
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-07-16
Linus Torvalds
Merge git-tools repository under "tools" subdirectory
blob
|
commitdiff
|
raw
|
diff to current
2005-07-09
Linus Torvalds
Make "git resolve" take the merge message in $3
blob
|
commitdiff
|
raw
|
diff to current
2005-07-08
Linus Torvalds
Add "git-sh-setup-script" for common git shell script...
blob
|
commitdiff
|
raw
|
diff to current
2005-07-06
Linus Torvalds
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-06-28
Linus Torvalds
Merge rsync://rsync.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-06-22
Linus Torvalds
Do a cross-project merge of Paul Mackerras' gitk visualizer
blob
|
commitdiff
|
raw
|
diff to current
2005-06-21
Linus Torvalds
Clean up different special *HEAD handling
blob
|
commitdiff
|
raw
|
diff to current
2005-06-20
Dan Holmsand
[PATCH] git-resolve-script: Add LAST_MERGE and use...
blob
|
commitdiff
|
raw
|
diff to current
2005-06-20
Linus Torvalds
Clean up MERGE_HEAD and ORIG_HEAD also for the trivial...
blob
|
commitdiff
|
raw
|
diff to current
2005-06-15
Linus Torvalds
Trivial git script fixups
blob
|
commitdiff
|
raw
|
diff to current
2005-06-08
Linus Torvalds
Make "git commit" work correctly in the presense of...
blob
|
commitdiff
|
raw
|
diff to current
2005-06-08
Linus Torvalds
Make default merge messages denser.
blob
|
commitdiff
|
raw
|
diff to current
2005-06-07
Linus Torvalds
git-resolve-script: stop when the automated merge fails
blob
|
commitdiff
|
raw
|
diff to current
2005-06-07
Linus Torvalds
git-resolve-script: don't wait for three seconds any...
blob
|
commitdiff
|
raw
|
diff to current
2005-06-06
Linus Torvalds
More work on merging with git-read-tree..
blob
|
commitdiff
|
raw
|
diff to current
2005-06-06
Linus Torvalds
git-read-tree: be a lot more careful about merging...
blob
|
commitdiff
|
raw
|
diff to current
2005-05-31
Linus Torvalds
git-resolve-script: use "git-apply --stat" instead...
blob
|
commitdiff
|
raw
|
diff to current
2005-05-25
Jeff Garzik
[PATCH] optimize git-resolve-script
blob
|
commitdiff
|
raw
|
diff to current
2005-05-11
Petr Baudis
Merge ... http://members.cox.net/junkio/git-jc.git
blob
|
commitdiff
|
raw
|
diff to current
2005-05-10
Junio C Hamano
Introduce GIT_DIR environment variable.
blob
|
commitdiff
|
raw
|
diff to current
2005-05-06
Linus Torvalds
Merge of http://members.cox.net/junkio/git-jc.git
blob
|
commitdiff
|
raw
|
diff to current
2005-05-05
Linus Torvalds
Fix git-resolve-script.
blob
|
commitdiff
|
raw
|
diff to current
2005-05-05
Linus Torvalds
Split "git-pull-script" into two parts
blob
|
commitdiff
|
raw
|
diff to current
projects / git / history
Junio C Hamano
Linus Torvalds
Linus Torvalds
Linus Torvalds
Linus Torvalds
Dan Holmsand
Jeff Garzik
Petr Baudis