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
Jun
i
o C Hama
n
o
git log -p --merge [[--] paths
.
.
.
]
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Juni
o
C
H
a
m
ano
rev-parse doc
u
me
n
t
ation: talk about range
not
a
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hamano
show-branch:
match documentatio
n
and usage
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C
Hamano
Mer
g
e branch 'js/merge-base
'
commit
|
commitdiff
|
tree
2006-07-07
Junio C Haman
o
builtin-re
v
-pa
r
se
.
c
: constness tig
h
tening
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Ju
n
io C
Hamano
Me
r
ge branc
h
'ew/insta
w
eb'
commit
|
commitdiff
|
tree
2006-07-06
J
u
n
i
o
C
Hamano
g
it-r
e
s
e
t: complain an
d
e
x
it
u
pon seeing
an un
k
nown
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-05
Junio C
H
amano
Mer
g
e
b
r
a
nch '
l
t/gitweb
'
commit
|
commitdiff
|
tree
2006-07-05
J
u
nio C
H
am
a
n
o
M
erge
branch 'jc
/
fmt-merge-m
s
g-test'
commit
|
commitdiff
|
tree
2006-07-05
Jun
i
o C Haman
o
Merge
b
ranch
'
jc/sha1'
commit
|
commitdiff
|
tree
2006-07-05
Jun
i
o C Hamano
Merge
branch 'j
c
/diff-tes
t
'
commit
|
commitdiff
|
tree
2006-07-05
Junio
C
Hama
n
o
Merge branch
'
th/diff'
commit
|
commitdiff
|
tree
2006-07-05
Junio C Haman
o
M
erge branch 'jc/
g
re
p
fix'
commit
|
commitdiff
|
tree
2006-07-05
Ju
n
io
C Hamano
Merge branch
'
js/fmt-merge
-
msg
'
commit
|
commitdiff
|
tree
2006-07-05
Junio C Hamano
Re-fi
x
clear_commi
t
_marks()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Junio C
Haman
o
g
it-g
r
ep: use a bit
more specific e
r
ror messages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Junio C Haman
o
git-grep: fix e
x
i
t
code wh
e
n we us
e
external gre
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
J
u
nio C Hamano
g
it-g
r
ep:
fix parsi
n
g of
p
athspec
separat
o
r '--'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Junio
C
H
aman
o
t6200:
f
m
t-merge-msg test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Junio C
Hamano
send-email:
d
o not barf when
Term
:
:ReadLine d
o
es
not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Juni
o
C Hamano
boolean:
a
cc
e
pt yes and no
a
s
well
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-03
Junio C Hamano
M
erge branch 'm
a
st
e
r' into
js/merge-base
commit
|
commitdiff
|
tree
2006-07-03
Junio C Ham
a
no
revert
clea
r
-commit-ma
r
k
s
f
or now
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-03
Junio C Ham
a
no
g
e
t_merge_bases: clean up ev
e
n when the
r
e is
n
o
c
o
mm
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-03
Junio C Haman
o
Makefile: tig
h
ten git-
h
ttp-{fetch
,
p
u
sh} dep
e
ndencie
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
J
unio
C
Hamano
commit
.
c: do not redefine UNINT
E
R
ESTING bit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Junio C
H
amano
b
uiltin-diff: turn recursive on when de
f
aulting to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Junio C
H
amano
t40
1
3
: add "diff"
U
I progr
a
m
t
ests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
J
u
nio
C
Hamano
gitweb:
op
t
imize
per-file
history
g
e
neration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Ju
n
i
o
C Ha
m
ano
gitweb: op
t
imize per-fil
e
history generation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-01
Jun
i
o
C Hamano
upload-pack
.
c:
<
sys/poll
.
h> in
c
lud
e
s <
c
type
.
h> on OpenBSD 3
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-30
Junio C Hamano
Merge b
r
a
nch 'jc/test-3402
'
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
Ra
c
y GIT
(
p
art #3)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Ju
n
io C
H
a
m
a
no
Merge branch 'jc/diff-test-
u
pdates
'
i
n
to th/
d
iff
commit
|
commitdiff
|
tree
2006-06-29
Junio C Ha
m
a
no
t4013: note improvements brought by the new output
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
J
uni
o
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
b
ranch 'j
c
/d
i
f
f
-te
s
t' into th
/
diff
commit
|
commitdiff
|
tree
2006-06-29
Jun
i
o C H
a
mano
t4
0
13: a
d
d
form
a
t
-p
a
tch tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
f
ormat-
p
atch: fix diff form
a
t
o
ptio
n
imp
l
ementation
commit
|
commitdiff
|
tree
2006-06-29
Junio C
Hama
n
o
Merge
b
r
a
nch 'jc/repack'
commit
|
commitdiff
|
tree
2006-06-29
Juni
o
C Hamano
Merg
e
bra
n
c
h
'js/patch'
commit
|
commitdiff
|
tree
2006-06-29
J
unio
C
H
amano
di
f
f
.
c: fix get_patch_id()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
t4
0
14
:
fix test commit labels
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
J
unio C Hamano
c
h
e
c
kout -m: fix rea
d
-tree invo
c
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hama
n
o
t/REA
D
M
E
: start testing por
c
ela
i
nis
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hama
n
o
Mer
g
e b
r
anch 'jc/diff-t
e
st-updates' into th/diff
commit
|
commitdiff
|
tree
2006-06-28
Jun
i
o C Hamano
comb
i
ne-diff
.
c:
t
y
p
e
sanity
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
connec
t
.
c: check the commit buffer bo
u
ndary wh
i
le parsing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hama
n
o
con
n
ect
.
c: remove
unused
p
ara
m
e
t
ers from
t
cp_conn
e
ct
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
combine-d
i
ff
.
c: type sanity
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Jun
i
o C Hama
n
o
t4013 test updates for new
out
p
u
t cod
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
J
u
n
io C
H
a
m
an
o
Fix some m
o
re diff options cha
n
g
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Junio C Haman
o
Merge br
a
n
c
h
'
j
c
/di
f
f-t
e
s
t'
int
o
t
h
/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 Haman
o
t401
4
: add
f
ormat-pa
t
c
h
--ignore-if-
i
n-upstream
t
est
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
J
unio
C Hamano
t4013: add tests
for diff
/
log fam
i
ly output
options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Juni
o
C
Hamano
Merg
e
bra
n
c
h
'jc/squash'
commit
|
commitdiff
|
tree
2006-06-26
Junio
C Ham
a
no
Merge branc
h
'j
c
/d
i
ff
'
commit
|
commitdiff
|
tree
2006-06-26
Juni
o
C Hamano
M
e
rge branch 'ml/cvs
i
mport'
commit
|
commitdiff
|
tree
2006-06-26
Junio C
H
amano
Me
r
ge branch 'js/diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
Merge bran
c
h 'ew
/
rebas
e
'
commit
|
commitdiff
|
tree
2006-06-25
Jun
i
o
C
Hamano
git-r
e
pack
:
Be
c
areful
w
h
e
n updati
n
g the same pack
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Junio C Ham
a
n
o
diff
-
-co
l
or: us
e
$G
I
T
_
D
IR/
c
onfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
J
u
nio C Hamano
r
ep
o
-config: fix
printing of boo
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Ju
n
io C Ha
m
ano
dif
f
--color: use
r
eset seq
u
ence w
h
en
we m
e
a
n
r
ese
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Jun
i
o C Ham
a
n
o
test-sha1: test hashing larg
e
buff
e
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Ha
m
a
n
o
git-merge --squas
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C H
a
m
a
n
o
Makefile: add
fram
e
work to
verify and
b
ench sha
1
implement
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio
C
Haman
o
git-pul
l
: abo
r
t when
fmt
-
merge
-
msg fails
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
J
u
n
i
o
C Haman
o
M
erg
e
branch 'pb/er
r
or'
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
usage: min
i
mum type fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
H
a
mano
Makefile: do not r
e
comp
i
le ma
i
n progr
a
ms
w
hen li
b
raries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge bra
n
ch 'master' into next
commit
|
commitdiff
|
tree
2006-06-22
Junio C Haman
o
M
e
rge
b
ranch 'js/lsfix'
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o
C
Hamano
Merge branc
h
'ew/
r
ebase'
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
io C Hamano
M
e
r
ge br
a
nch 'jn/web'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge earl
y
p
arts o
f
branch 'js/diff'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Ham
a
no
Me
r
ge br
a
n
c
h
'jc/upload-corrupt'
commit
|
commitdiff
|
tree
2006-06-22
Junio C H
a
mano
M
e
rg
e
branch 'ew/rebase' i
n
t
o
n
e
x
t
commit
|
commitdiff
|
tree
2006-06-22
J
u
n
io C Hama
n
o
Merge branc
h
'
j
n/web'
i
nto next
commit
|
commitdiff
|
tree
2006-06-22
Junio C
Hamano
M
e
rge
b
ranch 'j
c
/wait
p
id'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge
b
ranch 'ff/c
9
9
'
commit
|
commitdiff
|
tree
2006-06-22
Juni
o
C H
a
mano
M
e
rge b
r
anch 'pb
/
config'
commit
|
commitdiff
|
tree
2006-06-22
J
unio C
Ha
m
ano
Merge bra
n
ch
'
l
t/objli
s
t'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Ma
k
efile: do
n
ot force unne
e
de
d
recompi
l
ation
upon
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C H
a
mano
rebase --merge
:
fix
for rebasing more than 7 commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o C Ha
m
an
o
Merge branch 'maste
r
'
i
nt
o
next
commit
|
commitdiff
|
tree
2006-06-21
Junio C
H
amano
Mer
g
e branch 'jc/
u
pl
o
ad-corrupt' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C H
a
mano
M
e
r
ge
b
ranch
'
jn
/
web'
into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Ha
m
ano
daemon: send st
d
err
to /dev/nul
l
instead of closin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C
H
amano
Merge branch '
e
w/r
e
base'
i
nto next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Ha
m
ano
Add renaming-rebase tes
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Merge b
r
anch 'f
f
/c99' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C H
a
mano
Merge branch
'
jc/upload-corrupt' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C
H
a
mano
up
l
oad
-
pac
k
/fe
t
ch
-
pack: supp
o
rt side-b
a
nd communi
c
ati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Retir
e
git-clone-pack
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jun
i
o C Hamano
upload-pack: pre
p
are for
s
i
deband
m
e
ssa
g
e sup
p
ort
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
u
nio C Hamano
u
pload-
p
ack: avoi
d
sending an incom
p
lete
p
a
ck u
p
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio
C
H
amano
Merge
branch 'jn/web' into ne
x
t
commit
|
commitdiff
|
tree
2006-06-21
Junio C Ham
a
no
Merge branch '
m
aster' in
t
o nex
t
commit
|
commitdiff
|
tree
next