repo.or.cz
/
git
/
gitweb.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
Hama
n
o
Merge branch 'jc/apply'
commit
|
commitdiff
|
tree
2006-05-17
Linus Torvalds
R
e
move ol
d
"git-grep
.
sh" r
e
mnants
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-17
Junio C H
a
m
a
no
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2006-05-17
Junio C Hamano
Merge
bran
c
h '
n
p/
p
ack'
commit
|
commitdiff
|
tree
2006-05-17
Junio C Hamano
merge-
b
ase: Clarify the comments on
p
ost processing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-16
N
icolas Pitre
improve d
e
pth heuristic
f
or maxim
u
m delta
s
ize
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-16
Junio
C
Hamano
Merge branch 'se/tag'
commit
|
commitdiff
|
tree
2006-05-16
Junio
C Hamano
Merge branch
'
se/rev-parse'
commit
|
commitdiff
|
tree
2006-05-16
Junio C Hamano
Me
r
ge
branch 's
e
/di
f
f'
commit
|
commitdiff
|
tree
2006-05-16
Junio C Hamano
M
e
rge
b
ranch 'se/
r
ebase'
commit
|
commitdiff
|
tree
2006-05-16
Fredrik Ku
i
vinen
U
pdate the documen
t
at
i
on for git-merge
-
base
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-16
Junio C Hama
n
o
builtin-diff: fix compar
i
son between tw
o
blobs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-16
Junio C
Ha
m
ano
Mer
g
e branch
'lt/oneway'
commit
|
commitdiff
|
tree
2006-05-16
Junio C Hamano
Me
r
ge
b
r
a
nch
'ew
/
send-email'
commit
|
commitdiff
|
tree
2006-05-16
J
unio C Ha
m
ano
Merg
e
bran
c
h 'l
t
/config'
commit
|
commitdiff
|
tree
2006-05-16
Jun
i
o C Hamano
M
e
r
g
e
bra
n
ch 'jc/g
r
ep'
commit
|
commitdiff
|
tree
2006-05-16
Jun
i
o C Ha
m
ano
Merge
branch 'l
t
/diff'
commit
|
commitdiff
|
tree
2006-05-16
L
inus Torvalds
F
ix silly
typo in new builtin grep
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-16
Junio C Hamano
g
it-a
m
:
u
se apply
-
-cache
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-16
Juni
o
C
H
amano
apply
--cached:
apply a patch
without using wo
r
king
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Juni
o
C Ha
m
ano
Merge branch 'fix'
commit
|
commitdiff
|
tree
2006-05-15
Junio C H
a
mano
b
uil
t
in-
g
rep: u
n
parse
more comma
n
d line
options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Junio
C Hamano
F
ix
p
ack-index
i
ssue on
6
4
-
bit pl
a
tforms a bit more
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Er
i
c Wong
Insta
l
l
g
it-send-email by
default
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Den
n
is
S
t
osberg
Fix compilat
i
on
o
n
newer NetBSD
s
ystems
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Ni
c
olas Pitre
p
a
ck-object: sligh
t
l
y more efficient
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Nic
o
las Pitre
simple euristic for further free
p
acking i
m
p
r
o
vements
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Linus Torvalds
re
a
d-t
r
ee --res
e
t -u fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Eric Wong
send-ema
i
l
:
quiet some
w
arnings,
reject inv
a
l
id
addresses
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Er
i
c Wong
s
e
nd-email: allow sendmail binary to be u
s
ed
i
n
stead
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
S
e
a
n
Strip useless "t
a
gs/" prefi
x
f
r
om git-tag -l output
commit
|
commitdiff
|
tree
2006-05-15
Junio C Hamano
apply --numstat: show new nam
e
,
not
o
ld na
m
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Junio
C
Hamano
M
e
rge bran
c
h 'fix'
commit
|
commitdiff
|
tree
2006-05-15
J
unio C Hamano
Merge b
r
a
nch
'
fix
'
into maint
commit
|
commitdiff
|
tree
2006-05-15
Junio C Ha
m
an
o
read-
t
r
e
e -u
one-way mer
g
e fix to check
out
loca
l
ly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Eric Wong
I
n
s
t
all
git
-
s
e
nd-e
m
ail by default
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Eric
Wong
send-email: address ex
p
ansion for common mailers
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
Linus Torvalds
builtin-
g
r
ep: use externa
l
grep w
h
en we can take adva
n
tag
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-15
J
u
nio
C Ham
a
no
diffs
t
at
renam
e
s
q
uashing fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
Linus Torvalds
Simp
l
i
f
y "
g
i
t
r
eset
--hard"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
Linus Torv
a
lds
Allow one-way tree merge to r
e
move old files
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
Sean
Conve
r
t some
"apply --s
u
m
m
a
r
y" user
s
to
"di
f
f --summ
a
ry"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
Sean
Add "--summar
y
" option to git diff
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
Sean
Make
git rebase
i
n
teractive help mat
c
h d
o
cument
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
Sean
Ensure au
t
h
o
r & committer bef
o
re ask
i
ng for commit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
L
i
nus
T
orvalds
git diff
:
support "-U" and
"
--uni
f
ied" opt
i
o
n
s
p
r
ope
r
l
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
Sean
Add "--branch
e
s", "--t
a
gs" and
"--remotes" options
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
Junio C Hamano
Merge bran
c
h
'
f
ix'
commit
|
commitdiff
|
tree
2006-05-14
J
unio C Hamano
Me
r
ge branch '
f
ix' into maint
commit
|
commitdiff
|
tree
2006-05-14
B
en
Clifford
i
nc
l
ude header to defi
n
e uint32_t, necessary on Mac
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
Junio C Hamano
Merg
e
branch 'ml/cvs'
commit
|
commitdiff
|
tree
2006-05-14
J
un
i
o
C Hamano
Merge branch 'fi
x
'
commit
|
commitdiff
|
tree
2006-05-13
J
unio C Hamano
Merge
b
ranc
h
'lt/fix-confi
g
' into lt/config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-13
Linus Tor
v
alds
g
it co
n
fig sy
n
tax up
d
ates
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-13
sean
A
nother
c
o
n
fig file parsing fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-13
Juni
o
C
Hamano
checkout: use --aggr
e
ssive when r
u
nning a 3-way merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-13
Dennis Stosberg
Fix git-p
a
c
k
-objects for 64-bit platfo
r
m
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
N
i
colas Pitre
fix di
f
f
-
d
elta bad m
e
mory access
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Junio C Ha
m
a
n
o
Merge br
a
nch 'fix'
commit
|
commitdiff
|
tree
2006-05-10
Jun
i
o C Hamano
c
heckout: us
e
--aggressive when ru
n
ning a 3-
w
ay merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Linus Torvald
s
r
evert/che
r
ry-pick: us
e
agg
r
essi
v
e me
r
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Junio C Ham
a
no
builtin-
g
r
e
p
:
-F (--fixed-str
i
ngs)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Junio C
H
amano
builtin-grep: -w f
i
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Junio C Hamano
b
u
i
l
tin-grep: typof
i
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-09
Jun
i
o C Hamano
Merge
b
ranch 'jc/cle
a
n'
commit
|
commitdiff
|
tree
2006-05-09
Jun
i
o C Hamano
Merge bran
c
h
'mw/
a
lte
r
nates'
commit
|
commitdiff
|
tree
2006-05-09
Ju
n
io
C
Hamano
Merge
branch 'jc/x
s
ha
1
'
commit
|
commitdiff
|
tree
2006-05-09
Junio C
H
a
m
a
n
o
M
erge branch 'jc/again'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
Merge bran
c
h 'np/delta
'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
M
erge branch 'jc/bindiff'
commit
|
commitdiff
|
tree
2006-05-09
J
unio C Hamano
Mer
g
e branch 'fix
'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
Merge branch 'tojunio' of http://locke
.
catalyst
.
net
.
.
.
commit
|
commitdiff
|
tree
2006-05-09
Yakov
Lerner
read-cach
e
.
c
: use xcalloc
(
)
n
o
t
call
o
c()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-09
Eric Wong
ap
p
ly: fix in
f
ini
t
e lo
o
p wit
h
mult
i
p
l
e patches with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-09
Ju
n
io C Ham
a
no
bui
l
tin-grep: tig
h
ten argu
m
ent
p
arsing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Ju
n
io
C Ha
m
a
no
Teach
g
it-
c
lea
n
optional <pa
t
hs>
.
.
.
p
a
rameters
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Juni
o
C Hamano
Me
r
ge branch
'
fix
'
commit
|
commitdiff
|
tree
2006-05-08
Dmit
r
y V
.
Lev
i
n
Sep
a
rate o
b
ject name error
s
f
r
o
m
usage e
r
rors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Hama
n
o
get_sha1()
- fi
x
i
n
f
inite loop on nonexist
e
nt st
a
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
J
unio C H
a
mano
Doc
u
mentation:
{c
a
ret} fixes (gi
t
-rev-
l
is
t
.
txt)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Hamano
builti
n
-grep
:
doc
u
mentatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Hamano
Teach -f <
f
ile> option to builtin-grep
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Nicolas Pitre
i
m
pro
v
e base85 generated assembly code
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Linus Tor
v
alds
Fix
"g
i
t diff --stat" wi
t
h long
filenames
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Hamano
Fix repo
-
c
o
nfig set-m
u
ltivar error retu
r
n
path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Martin Wa
i
tz
clone:
d
on't
clone the in
f
o
/
alternates
file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
M
ar
t
in Wait
z
test
c
ase
for
t
ransiti
v
e info/alternates
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Mar
t
i
n
W
a
it
z
Transitive
l
y re
a
d alternatives
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Ju
n
i
o
C
Ha
m
ano
Merge bra
n
ch 'f
i
x'
commit
|
commitdiff
|
tree
2006-05-07
Pe
t
e
r Hagervall
Sparse fix for buil
t
in-diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Martin
Waitz
repack: honor
-
d even
w
hen
no ne
w
pack was cre
a
t
ed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
M
a
rtin Waitz
clone: ke
e
p
-
-refer
e
n
c
e e
v
en with -l
-
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
J
unio C Hamano
repo-
c
onfig: document what va
l
ue_regexp does
a bit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Pavel Roskin
Release config lock if the regex is
i
nvali
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Matthias Lederhofe
r
core-tut
o
ri
a
l
.
tx
t
:
e
scape asterisk
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Jo
h
annes Sc
h
ind
e
l
i
n
Fix us
e
rs
o
f
p
refix_pat
h
() to free() onl
y
when necessa
r
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Johannes Sc
h
indelin
Fix
users of prefix_path() to free()
o
nly when necessary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
sean
t1300-repo-config: two new config
parsing tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
sean
Another
co
n
fig fi
l
e p
a
rsing fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Hamano
bina
r
y
d
iff and apply: testsu
i
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next