repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git log -p --merge [[--] paths...]
2006-07-07
Junio C Hamano
git log -p --
m
e
r
ge
[
[--]
pat
h
s
.
.
.
]
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-07
J
u
n
i
o C
Haman
o
rev-parse
documentation: ta
l
k
a
bo
u
t ran
g
e n
o
tation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hamano
show-branch: match docu
m
enta
t
ion
an
d
usage
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-07
J
u
nio
C
H
a
man
o
Merge bran
c
h
'
j
s/me
r
ge-base'
commit
|
commitdiff
|
tree
2006-07-07
Junio C Haman
o
bu
i
ltin-rev
-
p
arse
.
c
:
c
on
s
tne
s
s tighten
i
ng
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hamano
Merg
e
branch 'ew/
i
nstaweb'
commit
|
commitdiff
|
tree
2006-07-06
Junio C Hamano
git-reset:
c
omplain and exit upon s
e
ei
n
g a
n
un
k
nown
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-05
J
u
nio C Hamano
Merge
branch 'lt/g
i
tweb'
commit
|
commitdiff
|
tree
2006-07-05
J
u
nio C H
a
man
o
Merge branch 'jc/fmt-me
r
ge-msg-test'
commit
|
commitdiff
|
tree
2006-07-05
Junio C
Hamano
Merge branch 'jc/sha1'
commit
|
commitdiff
|
tree
2006-07-05
Juni
o
C Ha
m
ano
M
erge branch 'jc/dif
f
-test'
commit
|
commitdiff
|
tree
2006-07-05
Junio C Hamano
Merge branch
'th/
d
if
f
'
commit
|
commitdiff
|
tree
2006-07-05
Junio C
Hamano
Merge branch 'j
c
/grepfix'
commit
|
commitdiff
|
tree
2006-07-05
Jun
i
o
C Hamano
M
e
rge branc
h
'js/fmt-
m
erge-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
J
unio C
Hama
n
o
g
i
t-grep
:
use a b
i
t
mor
e
specific error messages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-04
Junio C Hamano
gi
t
-grep:
f
ix exit code when we use external grep
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-04
J
u
nio C Hamano
git
-
g
r
ep: fi
x
par
s
ing of p
a
thspe
c
separator
'--'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-04
Jun
i
o C Ham
a
no
t6
2
0
0
: fmt-merge-ms
g
test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-04
Junio C H
a
mano
se
n
d
-emai
l
:
do not barf when Ter
m
:
:
R
e
adLine do
e
s not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-04
Junio C Ha
m
a
n
o
boolean: accept ye
s
a
n
d no as wel
l
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
rev
e
r
t
c
l
ear-commit-marks for now
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-03
Jun
i
o C Ham
a
no
get_merge_
b
ases
:
clean up even
when
t
here is no co
m
mon
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-03
Junio C
H
amano
Makefile: ti
g
hten git-http-{fetch,pu
s
h}
d
ependenc
i
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-02
J
u
nio C Ha
m
ano
com
m
it
.
c: do
not rede
f
ine
UNINTERESTING bit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-02
Junio C Hamano
built
i
n-diff: turn recu
r
sive on when def
a
ulting to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-02
Juni
o
C Haman
o
t4013: add "diff
"
UI progr
a
m tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-02
Junio C
Hamano
gitweb: opt
i
mize per-file his
t
ory generat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-02
Junio
C
H
a
m
a
no
gitweb
:
o
p
timize per-file history generation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-07-01
Junio C Ham
a
no
upload-pack
.
c: <sys/poll
.
h> includes <ctyp
e
.
h> o
n
OpenBSD 3
.
8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-30
J
u
nio C Hamano
M
er
g
e branch 'j
c
/test-3402'
commit
|
commitdiff
|
tree
2006-06-29
Junio
C Hamano
Rac
y
GIT (part #3)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Haman
o
Merge b
r
anch 'j
c
/diff-test-upd
a
tes
'
into th/diff
commit
|
commitdiff
|
tree
2006-06-29
Junio
C
Hamano
t4013: note
improvements brought by
t
h
e new o
u
tput
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-29
Junio C H
a
mano
Mer
g
e branch
'
j
c/diff-test' into
jc/di
f
f-test-updates
commit
|
commitdiff
|
tree
2006-06-29
Junio
C
Hamano
Merge branch '
j
c/diff-test' into
th/diff
commit
|
commitdiff
|
tree
2006-06-29
Junio C Haman
o
t4013: add format-patch tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-29
J
u
nio
C
Haman
o
format-patch: fix
d
iff format option implement
a
tion
commit
|
commitdiff
|
tree
2006-06-29
Junio C Haman
o
Merge
b
r
anch 'jc/repa
c
k'
commit
|
commitdiff
|
tree
2006-06-29
Jun
i
o
C Hamano
M
erg
e
branc
h
'js/patch'
commit
|
commitdiff
|
tree
2006-06-29
J
unio C Hamano
diff
.
c: f
i
x get_patch_id
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-29
J
unio C
H
amano
t4014:
fix
test c
o
mmit
l
abel
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-29
Junio C
Hamano
check
o
ut
-m:
f
ix read-t
r
ee invocation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
t/README: start testing porce
l
ainish
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
Merge
b
r
a
n
c
h
'jc/diff-test-updates' into th/diff
commit
|
commitdiff
|
tree
2006-06-28
J
unio C
Ham
a
no
co
m
bine-d
i
ff
.
c: ty
p
e
s
anity
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Junio
C
H
amano
connec
t
.
c: c
h
eck
t
he
commit buffe
r
bounda
r
y
w
hil
e
parsi
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
con
n
ect
.
c: remov
e
unus
e
d param
e
t
ers from tcp_conne
c
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Juni
o
C
Hamano
combi
n
e-diff
.
c:
t
y
pe sanity
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-27
J
unio C Hamano
t
4
013
tes
t
up
d
ates for new
o
u
t
put cod
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-27
Junio C Haman
o
Fix some m
o
re diff
o
ptions changes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-27
J
unio C Hamano
Merge bran
c
h
'
jc/diff
-
te
s
t' i
n
to th/diff
commit
|
commitdiff
|
tree
2006-06-27
J
unio C
H
amano
t
4
0
1
3: add more tests around -
c
a
nd --cc
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
Junio C Haman
o
t
4014: add for
m
at-patch --
i
gnore-if
-
in-upstream
t
est
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
t4013: ad
d
tests fo
r
diff/log family
output option
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
Merge br
a
nch 'jc/squash'
commit
|
commitdiff
|
tree
2006-06-26
J
u
n
io
C
H
amano
Merge branch '
j
c/diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
Merge
b
ra
n
ch 'ml/cv
s
i
mpo
r
t'
commit
|
commitdiff
|
tree
2006-06-26
J
u
n
io
C
H
a
m
ano
M
e
r
g
e br
a
nch 'js/diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
Merge branch 'ew/r
e
bas
e
'
commit
|
commitdiff
|
tree
2006-06-25
Jun
i
o C Hamano
git-r
e
pack: Be careful when updating the s
a
me
p
a
c
k
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Junio C Ha
m
ano
diff --c
o
lo
r
:
u
se $GIT_DIR/config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Ham
a
no
r
e
po-config: fix
p
r
inting of bool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Jun
i
o C Hamano
diff --color: use reset sequence wh
e
n
w
e
mean reset
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Junio C H
a
mano
test
-
sha1: test ha
s
hing large
b
uffer
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Ju
n
io C Hamano
git-merge --s
q
u
ash
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
Make
f
ile
:
add fr
a
m
ew
o
rk to
v
erify a
n
d bench
s
ha1 implementat
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Junio
C Haman
o
g
i
t-pul
l
: abort when fmt-merge-msg fails
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Ju
n
i
o
C Hamano
Merge branch 'p
b
/
err
o
r'
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
us
a
g
e:
minimum type fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
J
u
nio
C Haman
o
M
a
kefile: do not recompile main programs
w
hen libraries
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
J
unio C
H
a
m
a
no
Merge
b
ranch 'master' int
o
n
ext
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
M
e
rg
e
branch 'js/lsfix'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
M
erge br
a
nch 'ew
/
reba
s
e
'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hama
n
o
Merge
b
ranc
h
'jn/we
b
'
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
H
a
m
a
no
Merge
e
arly p
a
rts of branch
'js/diff'
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
Ha
m
a
no
Me
r
ge bran
c
h
'
jc/uplo
a
d-corrupt'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Mer
g
e
branch 'ew/rebase' into next
commit
|
commitdiff
|
tree
2006-06-22
Junio C Ha
m
ano
M
e
r
g
e
bra
n
ch 'jn/web' into n
e
xt
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Me
r
ge branch 'jc/waitpid'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
M
e
rge bra
n
c
h
'
ff/c99'
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
io C
H
amano
Merge br
a
n
ch 'pb/co
n
fig'
commit
|
commitdiff
|
tree
2006-06-22
J
unio C Hama
n
o
Merg
e
b
r
a
nch 'lt/objlist
'
commit
|
commitdiff
|
tree
2006-06-22
J
u
nio
C Hamano
Mak
e
fi
l
e: d
o
not force unneeded re
c
omp
i
lation upo
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
J
u
n
io
C
Ham
a
no
rebase --merge: fi
x
f
or rebasing
more th
a
n 7
c
om
m
i
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
J
unio C Hamano
Merge b
r
anc
h
'master
'
into n
e
xt
commit
|
commitdiff
|
tree
2006-06-21
Junio
C Hamano
Merge
b
ranch 'jc/u
p
load-corru
p
t
'
into n
e
xt
commit
|
commitdiff
|
tree
2006-06-21
Juni
o
C H
a
mano
M
erg
e
branch 'jn/web
'
into
n
ext
commit
|
commitdiff
|
tree
2006-06-21
Juni
o
C Hamano
d
a
emon: send stderr to /dev/null ins
t
ead of closing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Jun
i
o C H
a
mano
Me
r
ge br
a
nch 'ew/rebase' into nex
t
commit
|
commitdiff
|
tree
2006-06-21
J
u
n
i
o
C
H
amano
A
d
d
re
n
aming-
r
ebase test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Junio C
H
a
m
a
n
o
Merge
branch
'ff
/
c99' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C
H
aman
o
Merge branch 'j
c
/upload-corru
p
t' int
o
next
commit
|
commitdiff
|
tree
2006-06-21
J
u
n
i
o
C Ha
m
ano
upload-p
a
c
k
/fetch
-
pa
c
k: suppo
r
t side-band
c
o
m
m
u
nication
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
R
etire git-clone-p
a
ck
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Junio
C
Hamano
upload-pack:
prep
a
re for sideba
n
d mess
a
ge suppor
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
uplo
a
d-pack: avo
i
d sending an inc
o
mple
t
e pack upon
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Ham
a
no
Merge branc
h
'jn/web' in
t
o
n
e
x
t
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
M
erge branch 'master' into next
commit
|
commitdiff
|
tree
next