repo.or.cz
/
git
/
jnareb-git.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 Hama
n
o
rea
d
-tree --reset: update working tree file
for con
f
licted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-04
J
u
nio C Hamano
M
e
r
g
e
branch 'jc/
f
mt-patch'
commit
|
commitdiff
|
tree
2006-06-04
J
unio C Ham
a
no
f
e
tc
h
: do
not rep
o
r
t
"same" unless -verbose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-03
Junio C Ha
m
ano
Merge branch
'ds
/
doc' into jc/fmt-patch
commit
|
commitdiff
|
tree
2006-06-02
Junio
C
Hamano
Merg
e
branch 'nh/http'
commit
|
commitdiff
|
tree
2006-06-01
J
unio C Hama
n
o
Merge git://git
.
kernel
.
org
/
pu
b
/scm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2006-05-31
Junio C Ha
m
ano
format-patch --signoff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-30
J
u
nio C Hamano
M
e
rge branch
'ew/tests'
commit
|
commitdiff
|
tree
2006-05-30
Junio
C Hamano
send-e
m
a
i
l:
d
o
not pas
s
bog
u
s a
d
dress to local sendmail
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-29
Junio C Hamano
M
e
rge branch 'lt/apply'
commit
|
commitdiff
|
tree
2006-05-29
Junio C
Hamano
Mer
g
e b
r
anch 'jc/cache-tree'
commit
|
commitdiff
|
tree
2006-05-29
Ju
n
i
o
C Ha
m
ano
Merge bra
n
ch '
j
c/dirwalk-n-cache-tree' into jc/cache
.
.
.
commit
|
commitdiff
|
tree
2006-05-29
Junio C Ham
a
no
git-fetc
h
:
avoid using "
c
ase
.
.
.
in
(
a
rm)"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-28
J
u
nio C Ham
a
no
Merge branch 'jc/mailinfo
'
commit
|
commitdiff
|
tree
2006-05-28
Juni
o
C Hamano
Mer
g
e
b
r
anch 'e
b
/m
a
ilinfo'
commit
|
commitdiff
|
tree
2006-05-28
Junio C H
a
mano
Le
t
g
it-clon
e
t
o p
a
ss -
-
temp
l
a
te=di
r
opt
i
on to git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-28
J
u
nio C Ha
m
ano
f
o
rm
a
t
-
patch:
-
n and -k are mutu
a
ll
y
e
x
c
l
usive
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-26
Junio C
Hamano
built-in f
o
rmat-patch: various
f
ixups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-26
Junio C Ham
a
no
[
P
A
T
CH] gitk: start-
u
p
bugf
i
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-26
J
u
nio C Ham
a
no
m
a
i
l
i
n
fo: More care
f
u
l
ly parse header lines in
read_one_head
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-25
Junio C Ha
m
a
n
o
ls-remote: fix rsy
n
c:
/
/ to re
p
ort
H
EAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-24
Junio C Hamano
fetch
.
c: re
m
ove an
u
nused variable and
de
a
d code
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-24
Jun
i
o C Ha
m
ano
M
erge
b
ranch 'm
a
ster' in
t
o
lt/apply
commit
|
commitdiff
|
tree
2006-05-24
Junio C Hamano
a
p
ply:
f
orce matching
at th
e
beginning
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-24
Ju
n
io
C Hamano
Merge branch 'jc/fmt-patc
h
'
commit
|
commitdiff
|
tree
2006-05-24
J
u
n
i
o
C
H
amano
Me
r
ge branch 'be/tag'
commit
|
commitdiff
|
tree
2006-05-24
Ju
n
io
C Hamano
Mer
g
e br
a
n
ch 'js/fmt-patch'
commit
|
commitdiff
|
tree
2006-05-24
Junio C Haman
o
Merge
branch 'jc/builtin-n-
t
ar-tree'
commit
|
commitdiff
|
tree
2006-05-24
Junio C
Hama
n
o
Merge bra
n
ch
'
jc/f
e
tch-sor
t
ed'
commit
|
commitdiff
|
tree
2006-05-24
Ju
n
io C Ha
m
ano
Mer
g
e
br
a
nch 'lt/d
i
rwalk
'
commit
|
commitdiff
|
tree
2006-05-23
Jun
i
o C Hamano
cv
s
impor
t
: do not barf on cr
e
a
tion of an empt
y
fil
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-23
Junio
C
Hama
n
o
M
erge branch 'jc/tartree' into
jc/
b
uiltin-n-tar-tree
commit
|
commitdiff
|
tree
2006-05-23
Junio C
H
aman
o
b
uilti
n
-rm: squelch compiler warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Jun
i
o C Hamano
T
u
torial #2: brok
e
n
link fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Junio C Hamano
fetch-pack: output
refs
i
n
t
h
e
order
t
hey
were given
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
J
uni
o
C Hama
n
o
diff: minor option com
b
in
a
tio
n
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
J
u
nio C Hamano
built
i
n format-p
a
tch: squelch content-type
f
or 7-bi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Jun
i
o
C Hamano
C
MIT_FMT_EMAIL: Q-encode Subjec
t
: an
d
dis
p
l
ay-name
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Junio C Hamano
m
ailinfo
:
skip bogus UNIX From
lin
e
ins
i
de body
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Junio C Haman
o
tuto
r
ial-2:
t
ypofix in
e
xamples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-21
J
u
nio C Hamano
git-rebase: use c
a
nonical A
.
.
B syntax to format-patc
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-21
J
u
nio
C
Hamano
chec
k
diff_cons
u
me
:
strtol p
a
r
a
met
e
r fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-21
Junio C Ha
m
an
o
g
i
t-format-patch: now b
u
ilt-in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-21
Ju
n
io C Hamano
Me
r
ge
b
ranch 'm
a
ster' into js/fmt
-
patch
commit
|
commitdiff
|
tree
2006-05-20
Junio C Hamano
Merge
branch
'lt/dirwalk
'
into jc/dir
w
alk-n-cac
h
e-
t
ree
commit
|
commitdiff
|
tree
2006-05-20
Junio C
H
amano
Merge
bra
n
ch
'jc/cache-tree' into jc/di
r
w
a
lk-n-cache
.
.
.
commit
|
commitdiff
|
tree
2006-05-20
Ju
n
io C Hamano
built-in tar-tree and remote ta
r
-t
r
ee
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-20
Junio C Hamano
M
e
rge branch 'js/
f
etchconf
i
g'
commit
|
commitdiff
|
tree
2006-05-20
Ju
n
io C Ham
a
no
Fix build
procedure for bui
l
ti
n
-init-db
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-20
Junio C H
a
mano
M
e
rge bran
c
h 'jc/read-tree-safety'
commit
|
commitdiff
|
tree
2006-05-19
Junio C
Hamano
Merge branch 'jc/apply'
commit
|
commitdiff
|
tree
2006-05-19
J
unio C Hamano
Merge branc
h
'eb/quilt'
commit
|
commitdiff
|
tree
2006-05-19
J
unio
C Hamano
Merge branch 'jc/grep'
commit
|
commitdiff
|
tree
2006-05-19
J
u
nio C Hamano
Merg
e
bran
c
h '
l
t/g
r
ep'
commit
|
commitdiff
|
tree
2006-05-19
Junio C
Hamano
Merge br
a
nch 'ts/doctar'
commit
|
commitdiff
|
tree
2006-05-19
Junio C Hamano
Me
r
ge early part of
'
sp/ref
l
o
g
'
branch
commit
|
commitdiff
|
tree
2006-05-18
Jun
i
o C
H
amano
bu
i
l
t
in-diff: do not
say
f
iles
are rena
m
ed
w
hen blo
b
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-18
J
unio C
Ha
m
ano
builtin-add: fix
u
nmatched pathspec warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-18
Junio C H
a
mano
Merge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2006-05-17
J
unio C Hamano
app
l
y --cached: do n
o
t check
newly
add
e
d
file in
the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-17
Junio C Hamano
Merg
e
branch 'ew/pre
t
ty-fmt'
commit
|
commitdiff
|
tree
2006-05-17
Junio C Hamano
Merg
e
branch 'jc
/
apply'
commit
|
commitdiff
|
tree
2006-05-17
Junio C
Hamano
Revert "builtin
-
grep: wo
r
ka
r
ound for non GN
U
grep
.
"
commit
|
commitdiff
|
tree
2006-05-17
Jun
i
o
C Ham
a
no
b
u
iltin-grep
:
workaround
f
o
r
n
on GNU grep
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-17
Jun
i
o C Hamano
read-tree -m -u: do not overwr
i
te or
r
emov
e
u
ntrack
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-17
Jun
i
o C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2006-05-17
Jun
i
o C Haman
o
Merge branch 'np/pack'
commit
|
commitdiff
|
tree
2006-05-17
Junio C Hamano
mer
g
e-base: Clarify the comme
n
ts on post
pro
c
e
ssing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-16
J
unio C Ham
a
no
Me
r
ge br
a
nch 's
e
/tag'
commit
|
commitdiff
|
tree
2006-05-16
Junio
C Hamano
Merge branch 'se/r
e
v-pars
e
'
commit
|
commitdiff
|
tree
2006-05-16
Junio
C Ha
m
ano
Merge bra
n
ch 'se/diff'
commit
|
commitdiff
|
tree
2006-05-16
Junio C Haman
o
Merge bra
n
ch 'se/rebase'
commit
|
commitdiff
|
tree
2006-05-16
Junio C Hamano
b
uiltin-
d
iff: fix comparison between
two b
l
obs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-16
Junio
C
Haman
o
Merge b
r
anch 'lt
/
oneway'
commit
|
commitdiff
|
tree
2006-05-16
Juni
o
C Haman
o
Merge
branch 'ew/sen
d
-email'
commit
|
commitdiff
|
tree
2006-05-16
Junio C Ham
a
no
Merge branch 'lt/config'
commit
|
commitdiff
|
tree
2006-05-16
Junio
C
H
amano
Merge
branch 'jc/grep'
commit
|
commitdiff
|
tree
2006-05-16
J
u
nio C Hamano
M
erge branch 'lt/
d
iff'
commit
|
commitdiff
|
tree
2006-05-16
Junio C
H
amano
git-am: use app
l
y --cached
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-16
Junio C
H
amano
apply --cached:
app
l
y a patc
h
without using wor
k
in
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
J
u
ni
o
C Hamano
Merge branch
'fix
'
commit
|
commitdiff
|
tree
2006-05-15
Junio C Ha
m
ano
builtin-grep: unparse more c
o
mmand lin
e
options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Juni
o
C H
a
mano
Fix pack
-
inde
x
iss
u
e on 64-
b
it platforms a b
i
t more
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Junio C
H
am
a
no
apply --numstat: show new nam
e
, not
old name
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Junio C Ha
m
ano
M
e
rge bran
c
h 'fix'
commit
|
commitdiff
|
tree
2006-05-15
Junio C Haman
o
Me
r
ge
bran
c
h 'fix
'
into maint
commit
|
commitdiff
|
tree
2006-05-15
Jun
i
o C
H
a
m
a
no
read-tr
e
e -u one-w
a
y mer
g
e
f
ix to ch
e
ck out locally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Junio
C
Hamano
diff
s
tat re
n
ame squas
h
ing fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
J
unio
C Ha
m
ano
Merg
e
branch '
f
ix
'
commit
|
commitdiff
|
tree
2006-05-14
Junio C Haman
o
Merge
bran
c
h 'fix' into maint
commit
|
commitdiff
|
tree
2006-05-14
J
unio C
Hamano
Merge branch 'ml/cvs'
commit
|
commitdiff
|
tree
2006-05-14
Junio C Hamano
Merge
bran
c
h 'fix'
commit
|
commitdiff
|
tree
2006-05-13
Ju
n
io C Hamano
M
erge br
a
nch 'lt
/
f
ix-config
'
in
t
o lt
/
config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-13
Junio C H
a
mano
c
heckout: use --a
g
g
r
essive wh
e
n r
u
nning a 3-
w
ay merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Junio C Haman
o
Merge
b
ranch 'fix'
commit
|
commitdiff
|
tree
2006-05-10
Junio C
H
amano
checkout:
u
se --aggre
s
sive when running a 3-
w
ay merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Junio
C Hamano
b
uilti
n
-grep:
-F
(
-
-fixed-strings)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Junio C Hamano
b
uiltin-grep: -w fi
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Juni
o
C Hamano
builtin-
g
re
p
: typofix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
Merge bra
n
ch
'j
c
/clean'
commit
|
commitdiff
|
tree
next