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
Retire 'stupid' merge strategy
2008-07-05
M
iklos
V
ajna
R
e
ti
r
e 'stupid
'
merge strategy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-05
T
homas
R
ast
Fix apply
-
-recount
handling of no-EO
L
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-04
Junio C Hamano
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-07-04
Junio C Hama
n
o
G
I
T 1
.
5
.
6
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-04
J
u
nio
C
H
amano
Fi
x
executabl
e
bits in t/ scr
i
pts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-04
Johan
n
es Sixt
t4
1
27-apply-same-
f
n: Avoid
sed
-
i
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-04
Junio C Ham
a
no
W
o
rk
a
r
o
und gcc warnings from
curl headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-03
Junio C Hama
n
o
fast-expor
t
-
-
e
x
po
r
t-marks:
f
ix of
f
by one error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-03
Thomas
Rast
git
-
s
e
nd-ema
i
l: Do not
attempt to S
T
ARTT
L
S mor
e
t
han
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-03
Jun
i
o
C Ha
m
a
no
Mer
g
e
b
r
a
n
ch 'j6t/mingw
'
commit
|
commitdiff
|
tree
2008-07-03
Junio
C
Ham
a
no
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2008-07-03
Junio C Hama
n
o
Merge
b
ranch 'js/maint-clone-inst
e
ado
f
' into maint
commit
|
commitdiff
|
tree
2008-07-03
Juni
o
C Hamano
M
erge
b
ranc
h
'j
k
/main
t
-fetch-
r
ef-hier' into maint
commit
|
commitdiff
|
tree
2008-07-03
Junio C Hamano
Merge b
r
anch 'jc
/
maint
-
reset'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2008-07-03
Shawn O
.
Pearce
Fix d
e
scrib
e
--tags --long so it does not seg
f
ault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-02
Joha
n
n
e
s Schind
e
li
n
git fetch-pack: do not c
o
mpla
i
n
a
bo
u
t
"
no common
co
m
mits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-02
B
rian
G
ernhardt
Docu
m
entatio
n
:
P
oint to git
c
li(7) from g
i
t(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-02
J
unio C Haman
o
Update draft release notes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-02
Nanako Shi
r
aishi
gi
t
cli: Documen
t
m
e
an
i
ng of --c
a
c
h
ed
a
n
d --
i
ndex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-02
Jonathan N
i
eder
Documentation f
o
r
m
atting and cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-02
Jona
t
han Nieder
Documentation: be
consistent about "git-" versus "git "
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-02
Jo
n
a
t
han Nieder
Documenta
t
ion: prepare
t
o be
consisten
t
about "git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-02
J
o
n
athan Nieder
git-daemon(1): d
o
n'
t
ass
u
m
e git-daem
o
n is in /usr/
b
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-02
Jo
n
athan Nie
d
er
D
ocumentation: co
m
p
l
i
c
at
e
example of "man git-co
m
mand"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-02
Jonathan Nieder
whites
p
ace fix in Documen
t
a
tion/git-repack
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-02
Jonathan Ni
e
der
Documenta
t
i
on: fix links
t
o tutori
a
ls and other new
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-02
Junio C Hamano
Merge maint in
commit
|
commitdiff
|
tree
2008-07-02
J
u
nio C Ha
m
a
no
S
t
art draft release notes for 1
.
5
.
6
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-02
T
homas Rast
Fix
'g
i
t sho
w
' on signed tag of signed tag of comm
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Junio C Ham
a
no
Merge br
a
nch 'ph/
m
ergetoo
l
'
commit
|
commitdiff
|
tree
2008-07-01
Junio C Hamano
Merge b
r
anc
h
'js/appl
y
-
r
ecount'
commit
|
commitdiff
|
tree
2008-07-01
Junio C Ha
m
a
n
o
Merg
e
bra
n
c
h
'jc/checkdiff'
commit
|
commitdiff
|
tree
2008-07-01
Junio C Ha
m
ano
M
e
rge
b
ranch 'kb/send
-
email-
f
ifo'
commit
|
commitdiff
|
tree
2008-07-01
Jun
i
o C Ha
m
ano
Merge branch 'tr/send-email-ssl'
commit
|
commitdiff
|
tree
2008-07-01
Junio C Hamano
Merge br
a
nch 'js/mai
n
t-clone-
i
nst
e
ado
f
'
commit
|
commitdiff
|
tree
2008-07-01
J
unio C Hama
n
o
Merge
b
ranch '
j
c/main
t
-reset'
commit
|
commitdiff
|
tree
2008-07-01
Junio
C Hamano
Merge b
r
anch 'jk/
m
aint-fetch-ref-hier'
commit
|
commitdiff
|
tree
2008-07-01
Ju
n
io
C
H
amano
Merg
e
bra
n
c
h
'dz/a
p
pl
y
-a
g
a
i
n'
commit
|
commitdiff
|
tree
2008-07-01
Junio C Hamano
Merge branch 'np/pack-
d
efau
l
t'
commit
|
commitdiff
|
tree
2008-07-01
J
u
n
io C Hama
n
o
Merge br
a
nch
'
jc/d
a
shless' (e
a
r
l
y
part)
commit
|
commitdiff
|
tree
2008-07-01
Junio C Hamano
Merge
branch 'nd/dashles
s
'
commit
|
commitdiff
|
tree
2008-06-30
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-30
Brian Gernhardt
Ad
d
test
r
esu
l
ts direc
t
ory to t/
.
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Jeff King
fetc
h
: giv
e
a
hint
t
o the user when lo
c
al refs fail
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Jeff
Ki
n
g
d
oc/r
e
v-pa
r
se: clarif
y
r
e
flo
g
vs -
-
until
f
o
r
sp
e
cifyin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Hamano
Update
draft rele
a
se no
t
es for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
jrniede
r
@
u
chicago
.
ed
u
Docu
m
entation
:
don't ass
u
me git-sh-
s
et
u
p and gi
t
-parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio
C
Hama
n
o
t9700: skip whe
n
Tes
t
::
M
ore i
s
not available
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
J
o
han
n
es Schindelin
clone:
r
espec
t
t
h
e
settings in $
H
OME/
.
gi
t
config an
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Brian Gernha
r
dt
F
ix t4017-d
i
ff-retval for
w
hite-spa
c
e from w
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Junio
C Hama
n
o
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-06-29
E
r
ic Wong
git-
s
vn: don
'
t sanitize remote names in co
n
fi
g
Junio C Hamano
wrote in <7vfxr23s6m.fsf@gitster...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
O
l
ivie
r
M
a
rin
show_stats():
f
ix stats width
calculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Olivier Marin
Docume
n
t
a
tion:
r
emove {show,
w
h
a
tcha
n
g
e
d}
.
d
ifftree config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Aver
y
Pennar
u
n
git-svn: av
o
id
filling
up the disk wi
t
h temp files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Björn Steinbr
i
nk
g
i
t cat-fi
l
e
: Fix memor
y
leak in b
a
tch mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Thoma
s
Rast
git-sen
d
-ema
i
l:
prevent undefin
e
d va
r
iable warn
i
ngs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Joey He
s
s
fi
x
git
c
o
n
f
ig
example
s
yntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Joche
n
Voss
avoid
o
ff-by-
o
ne
e
r
r
o
r
in ru
n
_upload
_
archive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Lea Wiemann
GIT-
V
ER
S
ION-GEN: d
o
not
f
ail if a 'HEAD' file
exists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Johann
e
s
S
c
h
i
n
d
e
lin
Allow git-apply to recount the lines in a hunk (AKA
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
J
ohannes Schind
e
lin
c
o
mmit-tree:
lift compl
e
tel
y
arbitrar
y
li
m
i
t of
1
6
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
D
m
itr
y
Pot
a
p
o
v
shrink
g
i
t-shel
l
by avo
i
ding redundan
t
depe
n
d
e
ncies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Chri
s
tian Couder
help:
c
heck early i
f
w
e
have a comman
d
, if not
t
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Don Zic
k
us
git-a
p
p
l
y:
handle a patch that
touches t
h
e
same path
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Jeff Ki
n
g
fetch: repor
t
local storage err
o
rs i
n
s
ta
t
us table
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
J
o
ha
n
nes Schindelin
clon
e
: respect
url
.
i
n
steadOf set
t
ing in g
l
obal configs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Ju
n
io C Hamano
Docume
n
t the double-
d
as
h
"rev -- path" di
s
a
m
bi
g
uator
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Upda
t
e
s
ample
p
r
e
-co
m
m
i
t hook to use "diff --chec
k
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
diff --check: detect l
e
f
t
o
v
er conflict
marke
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hama
n
o
Teach "diff --
c
heck" about new blank lines at
e
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Jun
i
o C Hamano
checkdiff: pass diff_options to the c
a
llba
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Ted Percival
Don't use dash c
o
m
m
ands (git-f
o
o) in t
u
t
orial-2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Lea Wiemann
te
s
t-lib
.
sh: show
g
it init outpu
t
whe
n
in v
e
rb
o
se mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Jun
i
o
C H
a
mano
check_and_emit_line(): rename an
d
refactor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
J
unio C Haman
o
d
i
ff --check:
e
xplain why we
d
o not ca
r
e wheth
e
r old
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio
C
Hamano
M
erge b
r
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hama
n
o
M
e
r
ge br
a
nch 'maint-1
.
5
.
5'
i
nto maint
commit
|
commitdiff
|
tree
2008-06-27
Junio C Ham
a
no
G
IT 1
.
5
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Jun
i
o C Hamano
M
erge branch 'maint-1
.
5
.
4'
i
nto maint-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
Jun
i
o
C
Hama
n
o
GIT 1
.
5
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Ha
m
ano
g
i
t-
s
hell: acce
p
t "gi
t
f
oo" form
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C
H
amano
diff
--c
h
eck
:
do not disca
r
d
e
rror stat
u
s upon
seeing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
J
e
f
f King
improve for-ea
c
h-ref tes
t
scrip
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jing Xue
Add 'git-p4
.
all
o
wSubmit' to gi
t
-p
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Ham
a
no
Start dra
f
t
r
e
le
a
se notes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Dmitr
y
Potapov
upd
a
t
e-
h
ook-example:
optionally allow non-fas
t
-f
o
rw
a
rd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
T
h
o
mas
Rast
git-s
e
nd-emai
l
: add
support for TLS via Net::
S
MT
P
::SSL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Ke
v
in Ballard
git-s
e
nd-e
m
ail: Accept fifos a
s
well as files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Nicol
a
s Pitre
pack
.
indexversion
config option now defa
u
lts to 2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Ha
m
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-26
Junio C
Hamano
Allow "git-reset path
"
wh
e
n unambigu
o
us
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
A
l
ex Riesen
Fix use of "p
e
rl -i" on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
J
u
nio
C
Hamano
GIT 1
.
5
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C
H
a
m
ano
Merge branch
'
sb/r
e
base
'
commit
|
commitdiff
|
tree
2008-06-25
Junio
C Hamano
Merge
b
ranch 'lw/git
w
eb'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
M
e
rge branch '
l
t/config-
f
s
ync'
commit
|
commitdiff
|
tree
2008-06-25
Junio C
H
amano
Merge branch 'sr/tests'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge branch 'jh/c
l
one-packed-refs'
commit
|
commitdiff
|
tree
2008-06-25
J
unio C
Hamano
Merge br
a
nch 'lw/perl
i
sh'
commit
|
commitdiff
|
tree
next