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 -u one-way merge fix to check out locally modified paths.
2006-05-15
Junio C Hamano
read-
t
ree -u one-way merge
f
ix to c
h
eck ou
t
locally
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-14
Linus
Torvalds
Simplify "git reset -
-
hard"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-14
Lin
u
s
Torvald
s
Allow
o
ne-way tree merge to remove
o
l
d
files
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-14
Juni
o
C
Hamano
M
erge branch 'fix'
commit
|
commitdiff
|
tree
2006-05-14
B
e
n
Clifford
i
n
clude header to define uint32_t, necessary on
M
ac
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-14
Junio C Hamano
Merge
branch 'ml/cvs'
commit
|
commitdiff
|
tree
2006-05-14
Junio C Hamano
Merg
e
bran
c
h '
f
i
x
'
commit
|
commitdiff
|
tree
2006-05-13
Denn
i
s Stosberg
Fix git-p
a
c
k-ob
j
ects for
64-bit p
l
atforms
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-10
Nicolas Pitre
fix
d
iff-del
t
a
bad memory
a
c
c
e
ss
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-10
Junio C H
a
m
ano
Me
r
ge branch 'fi
x
'
commit
|
commitdiff
|
tree
2006-05-10
Junio C Hama
n
o
checkout: use --aggressiv
e
when
r
unning a 3-way merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-10
Linus Torvalds
re
v
er
t
/cherr
y
-pick: us
e
aggres
s
iv
e
me
r
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
M
erge branch 'jc/clea
n
'
commit
|
commitdiff
|
tree
2006-05-09
J
u
nio C Hamano
Me
r
g
e
branch 'mw/
a
lternates'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
Merge branch
'
jc/xsha1'
commit
|
commitdiff
|
tree
2006-05-09
J
unio C
Hamano
Merge
branch 'jc/again
'
commit
|
commitdiff
|
tree
2006-05-09
Junio C
H
amano
Mer
g
e bran
c
h 'np
/
d
e
lt
a
'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Haman
o
Merge branch 'j
c
/bind
i
ff'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Ha
m
ano
Mer
g
e
b
r
a
nch
'
fix'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
Merge branch 't
o
junio' o
f
http://locke
.
catalyst
.
n
e
t
.
.
.
commit
|
commitdiff
|
tree
2006-05-09
Yakov Lerner
r
ead-cac
h
e
.
c:
u
s
e
x
c
a
l
l
oc() not calloc()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-09
Eric Wong
apply: f
i
x
infinite loop with multiple pa
t
ches
w
ith
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
Ju
n
io C Ha
m
ano
T
e
ac
h
git
-
clean optional <paths>
.
.
.
parameters
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
J
unio C
Hamano
Merge branch '
f
ix'
commit
|
commitdiff
|
tree
2006-05-08
Dmit
r
y V
.
Levin
Separate obj
e
ct name erro
r
s from usage errors
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
Junio
C
Hamano
get_sha1
(
)
- fix infini
t
e loop on no
n
ex
i
stent stage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
J
unio
C
H
a
mano
D
o
cument
a
tion: {c
a
r
e
t
} fixe
s
(git-rev-
l
ist
.
txt)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
Nicolas Pitre
improve base85 generated assembly code
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
Linus Torva
l
ds
F
i
x
"
gi
t
diff --stat" with lo
n
g
fi
l
e
names
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
Junio C H
a
m
a
no
Fix repo-con
f
ig s
e
t-
m
ultivar error return pa
t
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Mart
i
n Waitz
clo
n
e: don't clone
t
he
i
nfo/alternates
f
i
le
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Mar
t
in Waitz
te
s
t
c
ase for transit
i
ve
i
nfo/
a
l
t
er
n
a
t
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Martin
W
a
i
tz
Tra
n
sit
i
v
ely rea
d
alterna
t
ives
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Junio C Hamano
Merge
b
ranch 'f
i
x'
commit
|
commitdiff
|
tree
2006-05-07
Peter Hage
r
val
l
S
p
arse
fix for buil
t
in
-
diff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Marti
n
Waitz
re
p
a
c
k: h
o
no
r
-
d
ev
e
n when
no
n
ew p
a
ck was
c
reated
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Martin Waitz
clone:
k
e
ep --referen
c
e even with -l -s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Junio C Hamano
r
e
po-config: docum
e
nt what
v
a
lue_regexp does
a bit
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Pavel Roskin
Release conf
i
g lock if the regex is
i
n
valid
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
M
atthi
a
s Lederhofer
core-tutorial
.
txt: e
s
cape as
t
erisk
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Joh
a
nnes Schindelin
Fix users
of prefix_path(
)
to free(
)
only
w
hen necessary
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Johanne
s
Schi
n
delin
F
ix us
e
rs of prefix_path
(
) to f
r
ee() onl
y
whe
n
n
e
cess
a
r
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
sean
t1300-repo-config: two new co
n
fig
p
ar
s
ing tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
sean
Ano
t
her
c
onfig file p
a
rsing fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
Junio C
Hama
n
o
b
i
nary diff and appl
y
: testsuite
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
Junio
C
Ha
m
a
n
o
u
pdate-i
n
dex
--again: t
a
k
e
optional
pathspecs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Ham
a
no
update-index --agai
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
Junio
C
Hamano
update-i
n
dex: plug memory leak f
r
om p
r
ef
i
x_pat
h
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
Junio
C Hama
n
o
checkout-i
n
de
x
: p
l
ug memory leak from prefi
x
_p
a
t
h
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Hamano
u
pdate-index --
u
n
res
o
lve: wo
r
k fro
m
a subdirector
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
J
u
nio C Hamano
b
i
nary diff
:
further
upda
t
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
Jun
i
o C Hamano
binary patch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
Junio
C
Hamano
pack-
o
bject: squelch eye-c
a
ndy on non-tty
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
Junio C Haman
o
M
e
rge branc
h
'f
i
x'
commit
|
commitdiff
|
tree
2006-05-05
Junio C Hamano
core
.
prefe
r
sy
m
linkre
f
s: us
e
s
ymlink
s
for
.
g
i
t/
H
EA
D
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
Johannes Sc
h
indeli
n
re
p
o-config
:
trim whi
t
e-space before comm
e
nt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
sean
Fix for
c
onfig file
s
ection
p
arsing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
sean
Clarify g
i
t
-ch
e
r
ry doc
u
m
e
ntation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
sean
Update git-un
p
ack-objects do
c
um
e
ntation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
sean
Fi
x
up docs where
"
-
-" isn't di
s
played cor
r
ectly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
sean
Several t
r
ivial doc
u
m
e
n
tation touc
h
ups
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
E
r
ic Wong
g
i
t-s
v
n 1
.
0
.
0
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
E
r
i
c
Wo
n
g
git-
s
vn: docum
e
nta
t
ion updates
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
Junio
C
Hamano
delta: stricter cons
t
ness
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
Junio
C
Hamano
Makefile:
do not link
r
ev-list any
s
p
ecially
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
Joha
n
n
e
s
S
c
hindelin
builtin
-
push
:
--all and
-
-
t
ags _are_
e
x
p
l
icit ref
s
p
e
cs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-04
Jun
i
o C
H
a
mano
Merge branch
'jc/log
s
'
commit
|
commitdiff
|
tree
2006-05-04
J
uni
o
C Hamano
Merge bra
n
ch
'
j
c
/show-br
a
nch-dens
e
'
commit
|
commitdiff
|
tree
2006-05-04
J
unio
C Ham
a
no
M
erge branch 'j
c
/symref'
commit
|
commitdiff
|
tree
2006-05-04
J
u
nio C Hama
n
o
Merge br
a
nch 'jc/diff'
commit
|
commitdiff
|
tree
2006-05-04
Junio
C Ha
m
ano
M
er
g
e branc
h
'
js/repo
c
onfig'
commit
|
commitdiff
|
tree
2006-05-04
Jun
i
o C
H
a
m
ano
Merge branch 'jc/count
'
commit
|
commitdiff
|
tree
2006-05-04
J
un
i
o C Hamano
Merge branch 'js/r
e
mo
t
econfig'
commit
|
commitdiff
|
tree
2006-05-04
Junio C
H
aman
o
M
e
rge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2006-05-04
J
o
n L
o
eliger
Add
a
few more words to the g
l
ossary
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-04
Jon Loeliger
A
dded definitions for a
f
ew words:
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-04
Jon Loeli
g
er
Alpha
b
etize the glossa
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-04
Linus Torvalds
sha1_to_hex() usa
g
e cleanup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-04
Junio C Hamano
Merge br
a
nch '
f
ix'
commit
|
commitdiff
|
tree
2006-05-04
F
r
edrik Kuivinen
blame:
Fix
p
a
t
h
p
run
i
ng
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-03
Martin Langhoff
cv
s
s
e
rv
e
r: use git-rev-list i
n
stead of git-log
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-03
J
o
hannes Schindelin
repo-config
:
deconv
o
l
ute lo
g
ics
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-03
L
i
nus Torv
a
lds
Fix "git-
l
og --
p
a
r
ent
s
" br
e
a
kage pos
t
v1
.
3
.
0
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-03
Matthias Kestenholz
add d
o
cumen
t
ation for
u
pd
a
te
-
index --unresolve
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-03
Matth
i
as Kestenholz
fix various
typos
i
n docume
n
tation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-03
Junio C Hama
n
o
builtin-c
o
unt-objects: open
packs when running -v
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-03
Nicolas Pitre
i
m
prove diff-del
t
a
w
ith spa
r
se and/or r
e
petitive d
a
ta
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-03
N
i
c
olas Pitre
tin
y
o
p
timiz
a
tion to diff-delta
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-03
J
u
nio C Hama
n
o
re
p
o-
c
onfig: readability fixups
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-03
J
u
nio C Hamano
core
.
pref
e
rsymlinkrefs: use symlinks for
.
g
i
t
/
HEAD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-03
Johannes Schindelin
r
epo-config: support --
g
et-
r
egexp
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-03
Jun
i
o C Hamano
Merge git://git
.
ke
r
nel
.
org
/
pub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2006-05-02
J
unio C Hamano
Mer
g
e bran
c
h 'fix'
commit
|
commitdiff
|
tree
2006-05-02
Mart
i
n
L
anghoff
g
i
t
-send-email
:
f
ix version string to be valid
perl
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-02
Ju
n
io
C Hamano
Revert "fe
t
ch,
p
ull:
a
sk confi
g
for remot
e
information"
commit
|
commitdiff
|
tree
2006-05-02
Johann
e
s Schind
e
lin
repo-config:
trim whi
t
e-space before comment
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-02
Johannes Schi
n
deli
n
re
p
o-conf
i
g: fix
s
egfaul
t
wi
t
h no argume
n
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-02
Robert Shearm
a
n
Give
t
h
e
u
s
er a h
i
nt fo
r
h
ow to cont
i
nue in the
case
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-02
Johannes S
c
hindelin
fetch, pull: ask
c
o
n
fig for remot
e
i
n
formation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-02
J
o
hannes Sc
h
indelin
builtin
-
p
u
s
h: al
s
o
ask con
f
ig for
remote info
r
m
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next