tokkee.org
Code
projects
/
git.git
/ search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Log ref changes made by git-merge and git-pull.
2006-07-10
Junio C Hamano
Merge branch 'jc/show-merge'
commit
|
commitdiff
|
tree
2006-07-10
Junio C Hamano
Merge branch 'lt/gitweb'
commit
|
commitdiff
|
tree
2006-07-10
Junio C Hamano
Merge branch 'jc/rename'
commit
|
commitdiff
|
tree
2006-07-10
Junio C Hamano
Merge branch 'jc/grep'
commit
|
commitdiff
|
tree
2006-07-10
Junio C Hamano
Merge branch 'jc/mailinfo'
commit
|
commitdiff
|
tree
2006-07-10
Junio C Hamano
Merge branch 'ew/diff'
commit
|
commitdiff
|
tree
2006-07-10
Junio C Hamano
Merge branch 'ew/svn'
commit
|
commitdiff
|
tree
2006-07-09
Junio C Hamano
"git -p cmd" to page anywhere
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-09
Junio C Hamano
Merge branch 'sf/diff'
commit
|
commitdiff
|
tree
2006-07-08
Junio C Hamano
diff: do not use configuration magic at the core-level
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-08
Junio C Hamano
colored diff: diff.color = auto fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hamano
git log -p --merge [[--] paths...]
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hamano
Update diff-options and config documentation.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hamano
diff.c: --no-color to defeat diff.color configuration.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hamano
git-svn: migrate out of contrib (follow-up)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hamano
rev-parse documentation: talk about range notation.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hamano
show-branch: match documentation and usage
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hamano
Merge branch 'js/merge-base'
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hamano
builtin-rev-parse.c: constness tightening
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hamano
diffcore-rename: try matching up renames without populating...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hamano
Merge branch 'ew/instaweb'
commit
|
commitdiff
|
tree
2006-07-06
Junio C Hamano
mailinfo: assume input is latin-1 on the header as...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-06
Junio C Hamano
git-reset: complain and exit upon seeing an unknown...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-05
Junio C Hamano
git-grep: boolean expression on pattern matching.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-05
Junio C Hamano
Merge branch 'lt/gitweb'
commit
|
commitdiff
|
tree
2006-07-05
Junio C Hamano
Merge branch 'jc/fmt-merge-msg-test'
commit
|
commitdiff
|
tree
2006-07-05
Junio C Hamano
Merge branch 'jc/sha1'
commit
|
commitdiff
|
tree
2006-07-05
Junio C Hamano
Merge branch 'jc/diff-test'
commit
|
commitdiff
|
tree
2006-07-05
Junio C Hamano
Merge branch 'th/diff'
commit
|
commitdiff
|
tree
2006-07-05
Junio C Hamano
Merge branch 'jc/grepfix'
commit
|
commitdiff
|
tree
2006-07-05
Junio C Hamano
Merge branch 'js/fmt-merge-msg'
commit
|
commitdiff
|
tree
2006-07-05
Junio C Hamano
Re-fix clear_commit_marks().
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Junio C Hamano
git-grep: use a bit more specific error messages.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Junio C Hamano
git-grep: fix exit code when we use external grep.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Junio C Hamano
git-grep: fix parsing of pathspec separator '--'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Junio C Hamano
t6200: fmt-merge-msg test.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Junio C Hamano
send-email: do not barf when Term::ReadLine does not...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Junio C Hamano
boolean: accept yes and no as well
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-03
Junio C Hamano
Merge branch 'master' into js/merge-base
commit
|
commitdiff
|
tree
2006-07-03
Junio C Hamano
revert clear-commit-marks for now.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-03
Junio C Hamano
get_merge_bases: clean up even when there is no common...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-03
Junio C Hamano
Makefile: tighten git-http-{fetch,push} dependencies
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Junio C Hamano
commit.c: do not redefine UNINTERESTING bit.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Junio C Hamano
builtin-diff: turn recursive on when defaulting to...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Junio C Hamano
t4013: add "diff" UI program tests.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Junio C Hamano
gitweb: optimize per-file history generation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Junio C Hamano
gitweb: optimize per-file history generation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-01
Junio C Hamano
upload-pack.c: <sys/poll.h> includes <ctype.h> on OpenBSD 3.8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-30
Junio C Hamano
Merge branch 'jc/test-3402'
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
Racy GIT (part #3)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
Merge branch 'jc/diff-test-updates' into th/diff
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
t4013: note improvements brought by the new output...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
Merge branch 'jc/diff-test' into jc/diff-test-updates
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
Merge branch 'jc/diff-test' into th/diff
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
t4013: add format-patch tests.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
format-patch: fix diff format option implementation
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
Merge branch 'jc/repack'
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
Merge branch 'js/patch'
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
diff.c: fix get_patch_id()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
t4014: fix test commit labels.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
checkout -m: fix read-tree invocation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
t/README: start testing porcelainish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
Merge branch 'jc/diff-test-updates' into th/diff
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
combine-diff.c: type sanity.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
connect.c: check the commit buffer boundary while parsing.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
connect.c: remove unused parameters from tcp_connect...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
combine-diff.c: type sanity
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Junio C Hamano
t4013 test updates for new output code.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Junio C Hamano
Fix some more diff options changes.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Junio C Hamano
Merge branch 'jc/diff-test' into th/diff
commit
|
commitdiff
|
tree
2006-06-27
Junio C Hamano
t4013: add more tests around -c and --cc
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
t4014: add format-patch --ignore-if-in-upstream test
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
t4013: add tests for diff/log family output options.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
Merge branch 'jc/squash'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
Merge branch 'jc/diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
Merge branch 'ml/cvsimport'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
Merge branch 'js/diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
Merge branch 'ew/rebase'
commit
|
commitdiff
|
tree
2006-06-25
Junio C Hamano
git-repack: Be careful when updating the same pack...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Junio C Hamano
diff --color: use $GIT_DIR/config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
repo-config: fix printing of bool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
diff --color: use reset sequence when we mean reset.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
test-sha1: test hashing large buffer
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
git-merge --squash
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
Makefile: add framework to verify and bench sha1 implementat...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
git-pull: abort when fmt-merge-msg fails.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
Merge branch 'pb/error'
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
usage: minimum type fix.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Makefile: do not recompile main programs when libraries...
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'master' into next
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'js/lsfix'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'ew/rebase'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'jn/web'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge early parts of branch 'js/diff'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'jc/upload-corrupt'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'ew/rebase' into next
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'jn/web' into next
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'jc/waitpid'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'ff/c99'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'pb/config'
commit
|
commitdiff
|
tree
next