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
checkout: use --aggressive when running a 3-way merge (-m).
2006-05-10
Junio C Hamano
checkout: use --ag
g
r
ess
i
ve w
h
en running a 3-way merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Lin
u
s Torv
a
lds
revert/cherry-pick: use aggressi
v
e merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-09
Yakov Lerner
read-cach
e
.
c:
use xcalloc(
)
not calloc()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-09
E
ric Wong
apply: fix in
f
inite
loop with multiple patches
w
ith
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Dmitry V
.
L
evin
Separate object
n
ame
e
rrors from usage errors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Hamano
Doc
u
me
n
tation:
{caret} fixes (git-rev-list
.
txt)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
L
i
nus
Torvald
s
Fix "git diff --stat" with
l
o
ng file
n
a
mes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Hamano
Fix repo-co
n
fig set
-
multiv
a
r er
r
or return path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
M
a
r
t
in W
a
itz
repac
k
:
honor
-d even when no new pack was creat
e
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Martin W
a
itz
clone: keep --
r
eference e
v
en with
-
l -s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Junio
C
Hama
n
o
r
e
po-config: document what value
_
regexp does a
bit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
P
a
v
e
l R
o
skin
Rele
a
s
e
c
o
nfig loc
k
if
t
he
r
egex is invalid
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Matth
i
as
Lederhofer
core-
t
utorial
.
txt: escape aste
r
isk
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Ju
n
io
C
Hamano
core
.
pr
e
fersymlinkrefs: use symlin
k
s
f
or
.
g
i
t/HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Joha
n
nes
S
chindelin
repo-config:
t
rim w
h
ite
-
sp
a
ce
b
e
fo
r
e
c
o
mm
e
nt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
s
ean
F
i
x f
o
r config
file section pa
r
s
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-04
Jon Loeliger
Ad
d
a f
e
w more w
o
rds to the glossary
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-04
Jon Lo
e
lig
e
r
Added definitions f
o
r a few words:
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-04
J
o
n
Loeliger
Al
p
ha
b
e
t
ize t
h
e
glossar
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Matth
i
a
s
Kestenholz
f
ix var
i
ous t
y
po
s
in documentat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Martin Langhoff
git-send-email: f
i
x version string t
o
b
e
vali
d
per
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Robe
r
t Shearman
Giv
e
the
u
ser a hint for how to continue i
n
t
he case
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-30
Huw D
a
vies
git-format-patch: Use rfc2
8
2
2
complian
t
date
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-28
Sean
E
stabrooks
Fix trivial typo in
g
i
t
-log man p
a
ge
.
commit
|
commitdiff
|
tree
2006-04-28
Se
a
n E
s
t
abrooks
Pr
o
perly render asc
i
ido
c
"c
a
llouts" i
n
git man pages
.
commit
|
commitdiff
|
tree
2006-04-28
Sean Estabrooks
Fix u
p
remaining
m
an pages that use ascii
d
oc "ca
l
lout
s
"
.
commit
|
commitdiff
|
tree
2006-04-28
Sean
E
s
t
abrooks
Update the
git-branch man pa
g
e to inclu
d
e th
e
"-r"
.
.
.
commit
|
commitdiff
|
tree
2006-04-28
Matthias Ke
s
t
enh
o
lz
annotate:
d
isp
l
a
y
usage information if no filename
.
.
.
commit
|
commitdiff
|
tree
2006-04-28
Ma
t
thi
a
s Kestenholz
annotate: fix w
a
r
ning
about uninitiali
z
ed
scalar
commit
|
commitdiff
|
tree
2006-04-28
J
u
n
io C Hama
n
o
git-am --resolved: more usable error
m
essage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
Junio C Hamano
verif
y
-p
a
ck: check
int
e
g
r
ity in
a
saner
o
rder
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Juni
o
C Ha
m
a
n
o
commit
-
t
r
ee
.
c
:
check_
v
alid() microo
p
t
i
mizati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Linus To
r
v
alds
Fix fi
l
ename ve
r
ific
a
tion
when in a subdirectory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Junio
C
Hamano
rebase:
t
ypofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-25
Serge E
.
H
allyn
socksetup: don't ret
u
rn
on set_
r
e
use_addr()
error
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-25
Pe
t
r
B
audis
Document the configuration file
commit
|
commitdiff
|
tree
2006-04-25
Petr Baudis
Document git-
v
a
r
-
l
li
s
ting a
l
so configurati
o
n var
i
ables
commit
|
commitdiff
|
tree
2006-04-25
Paul Macke
r
ras
r
e
v-parse: be
t
ter error mes
s
ag
e
for
ambigu
o
u
s
a
r
guments
commit
|
commitdiff
|
tree
2006-04-21
Linus T
o
rvalds
git
-
log pr
o
duces
no o
u
tput
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-21
Nicolas
P
itre
fi
x
pack-object
buffer size
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-21
Junio C Hamano
m
ailinfo: decode undersco
r
e used in "
Q
" encoding p
r
operly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-21
Santi_Béjar
Reint
r
oduc
e
svn p
o
ols t
o
solve the memory l
e
ak
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-21
Junio C Hamano
pack-objects: do not stop at object that is "too small"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-20
J
unio C Hama
n
o
g
it-commit
-
-amend: two fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-19
J
u
n
io C Hamano
pre
-
commit ho
o
k:
com
p
lain abou
t
conflict markers
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-19
Junio C H
a
mano
git
-
mer
g
e
:
a bit more re
a
da
b
le us
e
r guid
a
nce
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-19
Shawn P
e
a
r
ce
D
o
cument git-clone --reference
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-18
Jonas Fonseca
Fix
f
ilename scalin
g
fo
r
binary files
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-18
J
u
nio C Hamano
GIT
1
.
3
.
0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-18
Jona
s
Fonseca
Add git
-
a
nnotat
e
(1
)
and git-blame(1)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-18
Junio C Hama
n
o
di
f
f --
s
t
a
t: make sur
e
to set re
c
ursive
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-18
Herbert Va
l
erio
.
.
.
git-
s
v
nimport s
y
m
l
ink support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-18
Junio C Hamano
pa
c
ked
_
object_info_detail()
:
check for corr
u
pt
p
ackfile
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-17
S
e
rge E
.
H
a
llyn
cleanups: remove unused v
a
ri
a
ble f
r
o
m
e
x
ec_
c
md
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-17
S
e
rg
e
E
.
Hallyn
cleanups: prevent leak of two
s
trduped strings in config
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-17
Serg
e
E
.
Hallyn
cleanups: R
e
m
o
v
e
i
mpossible case in quote
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-17
S
erge E
.
Hallyn
clean
u
ps:
Remove unused v
a
rs from
c
ombine-diff
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-17
Serge
E
.
Hally
n
cleanu
p
s: Fix potent
i
al bugs in con
n
ec
t
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-17
Junio
C
Hama
n
o
M
e
rge b
r
a
nch 'jc/
b
oundary'
commit
|
commitdiff
|
tree
2006-04-17
Juni
o
C
Hamano
Merge bran
c
h
'
j
c/bott
o
mless'
commit
|
commitdiff
|
tree
2006-04-17
Yan
n
D
i
rson
Allow e
m
pty lines in
i
n
fo/g
r
afts
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-17
Junio
C
Hamano
rev-list --boundary: s
h
ow boun
d
ary commit
s
even when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-17
A Large An
g
r
y
SC
M
Make
f
ile
f
ixups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-17
Junio
C Hamano
M
e
r
g
e
git://git
.
ker
n
el
.
o
r
g/pub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2006-04-16
J
unio
C
Hama
n
o
reading
$GIT_DIR/info/graft - skip comments
corr
e
ctly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-16
Johannes S
c
hindelin
page
r
: do n
o
t fork a pager if PAGER
is set to empty
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-16
Johannes Schinde
l
in
diff-options: add -
-
pa
t
ch-with-stat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-16
Junio
C
H
a
mano
di
f
f-files --stat: do n
o
t dum
p
c
o
re with unmerged inde
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-16
Li
n
u
s Torvalds
Support "git cmd --help"
s
yntax
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-15
Junio C Hamano
diff --stat: do not do its ow
n
three-dashes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-15
J
unio C Hamano
d
i
ff-tre
e
: typ
e
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-15
Juni
o
C H
a
m
a
n
o
GIT v1
.
3
.
0-rc4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-15
J
unio C Hamano
Merge branch
'
dl/xdiff'
commit
|
commitdiff
|
tree
2006-04-15
J
unio C Hamano
M
erge
b
r
a
n
c
h
'js/d
i
f
f
stat'
commit
|
commitdiff
|
tree
2006-04-15
Junio
C
H
aman
o
Merge branch 'jc/fix5500'
commit
|
commitdiff
|
tree
2006-04-15
Junio C Hamano
rev-list --bi
s
ect: lim
i
t list be
f
ore bisecting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-15
Lin
u
s Torval
d
s
Clean up
trailing whitespace when pre
t
ty-printing com
m
i
t
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-14
Junio C
H
a
m
a
no
"
g
i
t
c
md -h" for s
h
el
l
scr
i
pts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-14
Junio C
Hamano
g
it-
l
og <diff-options
>
<
p
a
ths> documen
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-14
Ju
n
io C H
a
m
ano
R
e
tire git-log
.
s
h (take #4)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-14
Junio
C
Hamano
s
t
ri
p
s
p
ace: incomp
l
e
t
e lin
e
fix (t
a
k
e
#2)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-14
Junio C Ham
a
no
t5500: test fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-14
Junio C
Hamano
d
i
ff --stat
:
no need to ask funcna
m
es nor context
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-14
Ju
n
io C
H
amano
Fi
x
-up pre
v
ious exp
r
chan
g
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-13
Johannes
Sc
h
indelin
dif
f
-
o
p
t
ions: add --stat (t
a
ke
2)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-13
D
a
v
id
e
Liben
z
i
xdiff: p
o
st-p
r
ocess
h
u
n
k
s to make
them consis
t
ent
.
commit
|
commitdiff
|
tree
2006-04-13
Joh
a
nnes Sc
h
indelin
diff-op
t
ions: add --sta
t
(take 2)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-13
M
ar
k
Wo
o
ding
She
l
l utilities:
G
uard against ex
p
r' magic tokens
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-13
Junio
C
H
amano
t36
0
0
-rm: ski
p
f
a
i
led-
r
e
m
ove
test when we ca
n
not make
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-13
Li
n
us Torva
l
ds
Use
l
e
s
s memory in "git log"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-13
Junio C Hamano
git-
l
og:
do not output
excess
blank
line betwe
e
n commits
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-13
Ju
n
io C Hamano
M
a
ke
f
ile: $(MAKE) check-docs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-13
Junio C
Hamano
D
o
cumentation: a
d
d a
c
ouple of missing doc
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-12
Junio C Hamano
Merge br
a
nch 'jc/combine' into next
commit
|
commitdiff
|
tree
2006-04-12
Jun
i
o C Hamano
Merge branch 'master' int
o
jc/combine
commit
|
commitdiff
|
tree
2006-04-12
Junio C Hama
n
o
c
o
mbi
n
e-diff: t
y
pe fi
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-12
Jun
i
o C Hamano
str
i
psp
a
ce: mak
e
sure not to
leave an incomp
l
ete
line
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-12
J
uni
o
C Hamano
git-c
o
m
mit:
d
o not
m
uck wit
h
commit message when no_
e
dit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-12
Linus T
o
rv
a
ld
s
Wh
e
n showing a commit mess
a
ge, do not lo
s
e an in
c
omplete
.
.
.
commit
|
commitdiff
|
tree
2006-04-11
Junio C Ham
a
no
Retire
t550
1
-old-fetch-and-upload test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next