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
read-tree --reset: update working tree file for conflicted paths.
2006-06-04
Junio C Hamano
r
ea
d
-tree --re
s
e
t: update w
o
rking tree fil
e
for conflic
t
ed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-04
Junio C Hamano
Merge
b
ranch 'jc/fmt-patch'
commit
|
commitdiff
|
tree
2006-06-04
Jun
i
o
C
Hamano
fetc
h
:
d
o
n
ot
re
p
ort "
s
ame" unless -verbo
s
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-03
Junio C Ham
a
n
o
Merg
e
bra
n
ch 'ds/doc' int
o
jc/fmt-
p
atch
commit
|
commitdiff
|
tree
2006-06-02
Ju
n
io C Hamano
Merge bra
n
ch 'nh/http'
commit
|
commitdiff
|
tree
2006-06-01
Jun
i
o C Hamano
Merge git://git
.
kern
e
l
.
org
/
pub/scm/git
k
/gitk
commit
|
commitdiff
|
tree
2006-05-31
Junio
C
Hama
n
o
format-patch --signoff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-30
Junio C Hamano
Merge b
r
anch
'
ew/tests'
commit
|
commitdiff
|
tree
2006-05-30
Junio C
Hamano
send-email:
do not pass bogus add
r
ess
t
o local s
e
ndmail
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-29
Junio
C
Hamano
Merg
e
bra
n
ch 'lt/apply
'
commit
|
commitdiff
|
tree
2006-05-29
Jun
i
o C
Hamano
Merge branch 'jc
/
cache-tree'
commit
|
commitdiff
|
tree
2006-05-29
Junio C Ham
a
no
Merge bran
c
h
'
jc/dirwalk-n-cache-tre
e
'
i
n
to jc
/
cac
h
e
.
.
.
commit
|
commitdiff
|
tree
2006-05-29
Junio C Hamano
git-fetch: avoid using "case
.
.
.
in (arm)"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-28
Junio C Hamano
Me
r
g
e
b
ranch 'jc/ma
i
l
i
nfo'
commit
|
commitdiff
|
tree
2006-05-28
Junio C Hamano
Merge
b
ranch 'eb/maili
n
f
o
'
commit
|
commitdiff
|
tree
2006-05-28
Junio C Hama
n
o
L
et git
-
clone
to pass --templ
a
te=di
r
option to git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-28
Junio C Hamano
format-patch: -n and -k are mutually exclusive
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-26
J
u
nio C Hamano
built-in form
a
t-patch: various
fix
u
ps
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-26
Junio C Hamano
[PATCH] gitk: st
a
rt-up
bugfi
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-26
Jun
i
o
C Ha
m
an
o
mailinfo: More carefu
l
ly
p
a
rse h
e
ader lines in read_one
_
head
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-25
Junio C H
a
man
o
ls-remote: fix r
s
ync:
/
/
t
o
r
eport H
E
AD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-24
Junio C Hamano
f
etch
.
c: remov
e
an unused variable and
dead co
d
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-24
Juni
o
C
H
amano
Merge branch 'master' int
o
l
t/apply
commit
|
commitdiff
|
tree
2006-05-24
Junio C
Hamano
apply
:
force matching
a
t the beginning
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-24
Junio C Hamano
M
e
rg
e
branch
'
j
c/fmt-p
a
tch'
commit
|
commitdiff
|
tree
2006-05-24
J
unio C Ha
m
a
n
o
Merge
b
r
a
n
c
h 'be/tag'
commit
|
commitdiff
|
tree
2006-05-24
Junio C H
a
mano
M
erge br
a
nc
h
'js/
f
mt
-
patch'
commit
|
commitdiff
|
tree
2006-05-24
J
unio C Hamano
Me
r
ge b
r
anch 'jc/builtin-
n
-tar-
t
ree'
commit
|
commitdiff
|
tree
2006-05-24
Junio C Hamano
Merge
branch 'jc/fetch-sorted
'
commit
|
commitdiff
|
tree
2006-05-24
Junio C H
a
mano
Merge branch 'lt
/
dirwal
k
'
commit
|
commitdiff
|
tree
2006-05-23
J
u
nio
C
H
amano
c
v
s
import:
d
o no
t
b
arf
on
c
reation of
a
n emp
t
y
fi
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-23
Junio
C
Hamano
Merge bra
n
ch 'jc/tartre
e
'
into jc/bu
i
lti
n
-n-tar
-
tree
commit
|
commitdiff
|
tree
2006-05-23
Junio C Ha
m
ano
built
i
n-rm: squelch
c
omp
i
ler warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Junio C Hamano
Tutorial #
2
: broken
l
ink fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
J
u
nio C
H
am
a
n
o
f
e
tch-pack: output r
e
fs in
the order t
h
ey w
e
re given
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Junio C Ha
m
ano
di
f
f: m
i
nor option
co
m
bin
a
ti
o
n
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Junio C
H
amano
builtin form
a
t-patch: squelch content-t
y
pe f
o
r
7
-bit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Junio C Hama
n
o
CMIT_FMT_EMAIL:
Q-encod
e
Subj
e
c
t: and disp
l
ay-name
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Junio C Ham
a
no
mail
i
nfo: skip b
o
gus UNIX From
l
ine
i
nside body
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Junio C Hamano
tutorial-2: typofix in examples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-21
Ju
n
io
C Hamano
git
-
reb
a
se: use canonical A
.
.
B
s
ynt
a
x to format-patch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-21
Ju
n
i
o C Haman
o
checkdiff_con
s
ume:
strtol
p
ar
a
m
eter
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-21
Ju
n
io
C
Hamano
git-
f
ormat-patch: now built-in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-21
Junio C Ham
a
no
Merge branch 'mast
e
r' into js/
f
mt-pa
t
ch
commit
|
commitdiff
|
tree
2006-05-20
J
unio C
H
amano
Merge b
r
anch 'lt/dirwalk' into jc/dirwalk
-
n-
c
a
c
he-tree
commit
|
commitdiff
|
tree
2006-05-20
Juni
o
C Hamano
Mer
g
e branch 'jc/cache-tree'
i
nt
o
jc
/
di
r
walk-n
-
cach
e
.
.
.
commit
|
commitdiff
|
tree
2006-05-20
J
uni
o
C Hamano
built-in tar-tree and remote tar-
t
ree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-20
Junio C
H
a
m
ano
Merge
b
ranch 'js/f
e
tc
h
c
o
nfig'
commit
|
commitdiff
|
tree
2006-05-20
Jun
i
o
C
Hamano
Fi
x
build procedure for builtin-init-db
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-20
J
u
n
i
o C
H
a
mano
Me
r
ge branch 'jc/read-tree-
s
afety'
commit
|
commitdiff
|
tree
2006-05-19
Junio C Hamano
Merge br
a
nch 'jc/apply'
commit
|
commitdiff
|
tree
2006-05-19
J
unio C Hamano
Merge branch 'eb/quilt
'
commit
|
commitdiff
|
tree
2006-05-19
Junio C
Ham
a
no
M
e
r
ge branch 'jc/grep'
commit
|
commitdiff
|
tree
2006-05-19
J
u
nio C
H
am
a
no
Merge branch 'l
t
/gre
p
'
commit
|
commitdiff
|
tree
2006-05-19
Junio C H
a
mano
M
e
rge bra
n
ch 'ts/doct
a
r'
commit
|
commitdiff
|
tree
2006-05-19
Junio C H
a
mano
M
e
r
g
e
e
a
rly pa
r
t o
f
'sp/reflog'
b
r
anch
commit
|
commitdiff
|
tree
2006-05-18
Junio C Ham
a
n
o
builtin-diff: do
not say files are renamed when blob
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-18
Junio C
H
ama
n
o
b
u
iltin-add: fix unmat
c
hed pathspec w
a
rn
i
ngs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-18
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-05-17
Junio C Hamano
apply --cached:
d
o
n
ot chec
k
newly added
file in the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-17
Ju
n
io C Hamano
Merge bra
n
ch '
e
w/pretty-f
m
t'
commit
|
commitdiff
|
tree
2006-05-17
Junio C Haman
o
Merg
e
branch 'jc/a
p
p
l
y
'
commit
|
commitdiff
|
tree
2006-05-17
Junio C
H
amano
Revert "builtin
-
grep: workaround for
non GNU grep
.
"
commit
|
commitdiff
|
tree
2006-05-17
Junio
C
Ha
m
ano
bui
l
tin-grep: workaround for n
o
n GNU grep
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-17
Junio C Hamano
r
e
a
d-tree -m -
u
: do not overwrit
e
or remove untr
a
cked
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-17
Junio C Hamano
Merge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2006-05-17
Ju
n
i
o
C
Ham
a
no
Merge
b
ranch 'np/pack'
commit
|
commitdiff
|
tree
2006-05-17
J
u
n
i
o
C
H
aman
o
merg
e
-base: Clari
f
y the comm
e
nts on pos
t
proc
e
ssing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-16
Junio C
H
amano
Merge branch 'se/tag'
commit
|
commitdiff
|
tree
2006-05-16
J
u
nio
C
Hamano
Merge
b
ranch 'se/
r
ev-pars
e
'
commit
|
commitdiff
|
tree
2006-05-16
Junio C
Hamano
Me
r
ge
branc
h
'se/
d
iff'
commit
|
commitdiff
|
tree
2006-05-16
Junio C Hamano
M
e
rge branch '
s
e/rebase'
commit
|
commitdiff
|
tree
2006-05-16
Juni
o
C Hama
n
o
builtin-diff:
fi
x
com
p
ariso
n
between tw
o
b
lobs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-16
J
u
nio C Hamano
Merge branch 'lt/oneway'
commit
|
commitdiff
|
tree
2006-05-16
Junio C Ham
a
no
Merge branch 'ew/sen
d
-
email'
commit
|
commitdiff
|
tree
2006-05-16
Junio C Hamano
Merge bra
n
ch 'lt/con
f
i
g'
commit
|
commitdiff
|
tree
2006-05-16
Junio C Hamano
Merge branch 'jc/grep
'
commit
|
commitdiff
|
tree
2006-05-16
Ju
n
io C Hamano
Merge branch
'lt/diff'
commit
|
commitdiff
|
tree
2006-05-16
Junio
C
Hamano
g
it-am: u
s
e apply --cached
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-16
J
u
nio C Hamano
apply --cache
d
: apply a patch wi
t
hout using
w
o
rking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Junio C Hamano
M
erge b
r
anch
'f
i
x'
commit
|
commitdiff
|
tree
2006-05-15
Junio C Ha
m
a
n
o
builtin-grep
:
unparse mo
r
e
command line opti
o
ns
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Junio C Hamano
Fix pac
k
-index issue
on 64-bit pl
a
tforms a
bit more
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
J
u
nio
C Hamano
a
p
ply
--numstat: show n
e
w name, not old name
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
J
unio C Ham
a
no
Me
r
ge branch
'fix'
commit
|
commitdiff
|
tree
2006-05-15
Junio C
Hama
n
o
Merge branch 'fix
'
into maint
commit
|
commitdiff
|
tree
2006-05-15
Junio C
H
amano
read-
t
ree
-
u
one
-
w
a
y
merge f
i
x
to ch
e
c
k out
l
ocal
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Junio C Hamano
diffstat re
n
ame sq
u
a
shing fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
Junio C H
a
mano
Mer
g
e br
a
nch 'fix'
commit
|
commitdiff
|
tree
2006-05-14
J
u
n
io
C Ha
m
ano
Merge
b
r
anch 'fix' into mai
n
t
commit
|
commitdiff
|
tree
2006-05-14
Jun
i
o
C Hamano
Merge branch 'ml/cvs'
commit
|
commitdiff
|
tree
2006-05-14
Junio C
Hamano
Merge bran
c
h 'fi
x
'
commit
|
commitdiff
|
tree
2006-05-13
Ju
n
io C Hama
n
o
Merge branch 'l
t
/
f
i
x-conf
i
g' into lt/c
o
nfi
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-13
Junio C Hamano
checkou
t
: use
--agg
r
essive
when running a 3-way
me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Junio C Hamano
Merge bra
n
ch
'
fix'
commit
|
commitdiff
|
tree
2006-05-10
Junio C
H
amano
checkou
t
: use -
-
aggressiv
e
when running
a 3
-
way
merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Juni
o
C H
a
mano
builtin
-
gre
p
: -F (--fixe
d
-string
s
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Jun
i
o C Hamano
builtin-grep:
-w fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Junio C Hamano
builtin-grep: typof
i
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
M
erge b
r
anch 'jc/clean'
commit
|
commitdiff
|
tree
next