repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/apply'
2006-05-17
Junio C Hamano
M
erge branch 'jc/apply
'
commit
|
commitdiff
|
tree
2006-05-17
Linus Tor
v
alds
Remov
e
old "g
i
t-g
r
ep
.
sh"
rem
n
ants
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-17
Junio C Hamano
Mer
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2006-05-17
Junio C
Ha
m
ano
Merge bra
n
ch 'np/p
a
ck'
commit
|
commitdiff
|
tree
2006-05-17
Juni
o
C Hamano
m
e
rge-base: Clarify the comments on pos
t
p
rocessing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-16
Nicolas
P
itre
i
m
prove depth heuristic for maximu
m
del
t
a size
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-16
J
unio C Hamano
Merg
e
b
r
anc
h
's
e
/t
a
g'
commit
|
commitdiff
|
tree
2006-05-16
Ju
n
io C Hamano
Mer
g
e branch 'se/
r
ev-pars
e
'
commit
|
commitdiff
|
tree
2006-05-16
Junio C
H
amano
Mer
g
e b
r
anch
'se/diff'
commit
|
commitdiff
|
tree
2006-05-16
Ju
n
i
o C H
a
mano
Merge bra
n
ch 'se/reba
s
e'
commit
|
commitdiff
|
tree
2006-05-16
Fredrik Kuivine
n
Up
d
a
te the documenta
t
ion for git-merge-bas
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-16
Junio C Hamano
builtin-diff
:
fix comparis
o
n
b
etween two
b
l
ob
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-16
Jun
i
o C Hamano
Merge br
a
n
ch 'lt/oneway'
commit
|
commitdiff
|
tree
2006-05-16
J
un
i
o C Ha
m
ano
Merge bran
c
h 'ew/
s
end-email'
commit
|
commitdiff
|
tree
2006-05-16
J
unio C Hamano
Merge
branch 'lt/config'
commit
|
commitdiff
|
tree
2006-05-16
Junio
C Hamano
Merge branch 'jc
/
grep
'
commit
|
commitdiff
|
tree
2006-05-16
Junio C Ham
a
no
Merge b
r
anch '
l
t/diff'
commit
|
commitdiff
|
tree
2006-05-16
Linus Torvalds
F
i
x silly
typo in new
b
uil
t
in
g
rep
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-16
Junio C Hamano
git-am
:
use
a
pply --cach
e
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-16
Junio
C Ham
a
no
a
pply --ca
c
h
e
d: apply a
p
atch with
o
ut u
s
ing working
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-15
Junio C H
a
mano
M
erge branc
h
'fix'
commit
|
commitdiff
|
tree
2006-05-15
Jun
i
o C
Hama
n
o
bu
i
ltin-grep: unpars
e
more comman
d
line options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-15
Ju
n
io C Hamano
Fi
x
pack-index issue on 64
-
bit
p
latfo
r
ms a bit
m
o
re
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-15
Eric Wong
In
s
tall git-sen
d
-email by default
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-15
Den
n
is Stosberg
Fix compilat
i
on on
newer NetBSD s
y
stems
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-15
Nicolas
Pitre
pac
k
-obje
c
t: s
l
ightly more efficie
n
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-15
Nico
l
a
s
Pi
t
re
simple
e
uri
s
tic fo
r
fu
r
ther free packi
n
g improvements
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-15
Lin
u
s Tor
v
ald
s
rea
d
-tree --res
e
t -u fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-15
Eric
W
ong
send-email: q
u
iet some warnings, reject invalid addresse
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-15
Eri
c
Wong
sen
d
-email: a
l
l
o
w sen
d
mail binary to be use
d
instead
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-15
Sean
Str
i
p useless "tags/" p
r
efix from
g
it-tag
-l output
commit
|
commitdiff
|
tree
2006-05-15
Junio C
H
amano
a
pply
-
-
n
umstat:
s
how new na
m
e, not
old name
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-15
J
u
nio
C Hamano
Merge bra
n
ch 'fix'
commit
|
commitdiff
|
tree
2006-05-15
J
u
nio C Ha
m
ano
Merge branch 'fix' into maint
commit
|
commitdiff
|
tree
2006-05-15
Junio C Hamano
read-tr
e
e -u one-way merge
fix to
c
heck
out local
l
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-15
E
r
i
c
Wong
Install
git-sen
d
-
email by de
f
ault
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-15
Eric W
o
ng
send-email: addre
s
s expansion for
c
o
mmon mailers
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-15
Li
n
us Torvalds
bui
l
tin-g
r
ep: use external g
r
ep when we
can tak
e
advanta
g
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-15
J
u
nio C Ham
a
no
d
i
ffs
t
at
r
ename squas
h
in
g
fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-14
Linus Torvalds
Si
m
plify "g
i
t
r
eset
-
-hard"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-14
L
i
nus Torvalds
Allow
o
ne-way t
r
ee merg
e
t
o remove
old fi
l
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-14
Sean
Con
v
ert some "apply --summary
"
user
s
to "diff
-
-s
u
mmar
y
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-14
Sean
Add "--summary" optio
n
to git diff
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-14
Sean
Make git
rebase in
t
eractiv
e
he
l
p match d
o
cumenta
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-14
Sean
Ensure author
&
committer
b
efor
e
asking fo
r
commit
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-14
Lin
u
s T
o
rvalds
git
d
iff: support
"-U" and "--unifie
d
" optio
n
s p
r
operly
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-14
S
ean
Add "--branch
e
s", "--tags" and "
-
-r
e
motes" options
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-14
Ju
n
io
C Hamano
Merge branch '
f
ix'
commit
|
commitdiff
|
tree
2006-05-14
J
unio C Hamano
Merge br
a
nch
'
f
ix' i
n
to maint
commit
|
commitdiff
|
tree
2006-05-14
Ben Clifford
include hea
d
er to
de
f
ine uint32_t,
n
ecessary on Mac
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-14
J
unio
C
Hamano
M
erg
e
branch 'ml/cvs'
commit
|
commitdiff
|
tree
2006-05-14
Junio C Hamano
Merge
branch 'fix'
commit
|
commitdiff
|
tree
2006-05-13
Ju
n
io C H
a
mano
Merge
branch
'
lt/f
i
x-config' into lt/
c
on
f
ig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-13
Linus Torvalds
git config synt
a
x up
d
at
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-13
s
e
an
Another confi
g
file parsi
n
g fi
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-13
Junio C Hamano
checkout: use --ag
g
res
s
ive when running a 3
-
way
m
erge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-13
Dennis St
o
sberg
Fi
x
git-
p
ack-objects fo
r
6
4-bit platfo
r
ms
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-10
Nico
l
as Pit
r
e
fix dif
f
-delta bad memo
r
y access
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-10
Junio C Hamano
Merge branch '
f
ix'
commit
|
commitdiff
|
tree
2006-05-10
Junio C Hama
n
o
check
o
u
t
:
use --aggr
e
ssive when running
a 3-way merg
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-10
Linus Torv
a
ld
s
revert/cherry-pic
k
: use aggressive merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-10
Jun
i
o C
H
amano
builtin-gre
p
: -F (
-
-fixed-
s
trings)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-10
Junio C Hamano
b
u
iltin-g
r
ep: -w fix
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-10
Junio C
H
amano
builtin-gre
p
: typo
f
ix
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-09
Junio
C H
a
m
a
no
M
erg
e
branch 'jc/clean'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hama
n
o
Merg
e
br
a
nch 'mw/alternate
s
'
commit
|
commitdiff
|
tree
2006-05-09
Jun
i
o C Ha
m
ano
M
e
rge branch 'jc/x
s
h
a1'
commit
|
commitdiff
|
tree
2006-05-09
Junio
C
Hamano
Me
r
ge b
r
anch 'jc
/
again'
commit
|
commitdiff
|
tree
2006-05-09
J
u
nio C
H
ama
n
o
Me
r
ge br
a
nch
'n
p
/del
t
a'
commit
|
commitdiff
|
tree
2006-05-09
J
u
nio C Hamano
Me
r
ge branch
'
jc/bindiff'
commit
|
commitdiff
|
tree
2006-05-09
J
u
n
io
C Hama
n
o
Merge
b
ranch 'fix'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Ha
m
ano
Merge branch 'tojunio' o
f
http://locke
.
cat
a
lys
t
.
net
.
.
.
commit
|
commitdiff
|
tree
2006-05-09
Yakov Lerner
r
ead-cache
.
c: use xcalloc(
)
not calloc()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-09
Eric Wong
apply: fix infinite loop wit
h
mult
i
ple patc
h
es with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
buil
t
in-grep
:
tighten
a
rgument par
s
ing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
Junio C H
a
mano
Teach git-clean optional <paths>
.
.
.
param
e
ters
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
J
u
nio C Hamano
Me
r
ge branch 'fix
'
commit
|
commitdiff
|
tree
2006-05-08
Dmitry
V
.
Levin
Separat
e
object name errors
f
r
om usage err
o
r
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
J
unio C H
a
mano
get_sha1() - fix
infinite loop
o
n nonexistent st
a
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
Junio C
H
amano
Documen
t
a
tion: {
c
aret
}
fi
x
e
s (git-rev-li
s
t
.
txt)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Hamano
bu
i
l
tin-grep: docu
m
entation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
Junio C H
a
mano
Teach -f <file>
o
ption
t
o b
u
ilt
i
n-grep
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
N
icolas Pitre
impro
v
e base85 gener
a
ted assembly
c
o
de
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
Linus Torval
d
s
Fix
"
git diff --stat" with long file
n
ames
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
Junio
C
Hamano
Fix repo-config set
-
m
u
ltivar error
r
e
t
urn path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Mart
i
n
Waitz
clone: don't clone the info/alter
n
ates file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Martin Wait
z
t
e
s
t
case
for tr
a
nsitive info/alt
e
rnates
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Martin Waitz
Transiti
v
ely re
a
d a
l
terna
t
ives
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Junio C Ham
a
no
Merge branch
'
fix
'
commit
|
commitdiff
|
tree
2006-05-07
Pet
e
r Hage
r
vall
Sparse
f
ix for
b
uiltin-diff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Martin Waitz
r
ep
a
ck: honor -d even wh
e
n no new pack was created
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Martin Waitz
clone: k
e
ep --reference
ev
e
n with -l -s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Junio
C Ha
m
ano
rep
o
-confi
g
: docu
m
e
n
t wha
t
value_regexp does a
b
i
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Pa
v
el Roskin
Rele
a
s
e c
o
n
f
i
g
l
ock i
f
the regex is
invalid
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Matthias
L
ederhofer
core-tutorial
.
txt: escape as
t
e
r
isk
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
J
o
h
annes Schindelin
Fix users of
pre
f
ix_path()
t
o fr
e
e() on
l
y when necessary
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Johann
e
s
Schindelin
Fix u
s
ers of prefix_path() to free()
only when necess
a
ry
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
sean
t1300-
r
epo-
c
onfi
g
: two new config parsing
t
e
sts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
se
a
n
Another config file parsing fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Hama
n
o
bi
n
ar
y
diff and apply
:
t
e
s
t
s
u
ite
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next