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
Mik
l
os Vaj
n
a
Retire 'stupid' me
r
g
e
st
r
ategy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-05
Thom
a
s Rast
F
i
x
apply --recount handli
n
g of no-EOL
l
i
ne
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-04
J
unio C Ha
m
a
no
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-07-04
Junio
C
Haman
o
GIT
1
.
5
.
6
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-04
Junio C Ham
a
no
Fix
executable b
i
ts in
t/ scrip
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-04
Joh
a
nnes S
i
x
t
t
4
127-apply-same-fn: Avoid se
d
-i
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-04
J
u
nio
C
Hamano
W
o
rk a
r
o
und g
c
c
w
arnings from curl
h
eaders
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-03
Junio C
H
amano
fast-export -
-
ex
p
ort-marks: f
i
x off
b
y one error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-03
Thomas
R
as
t
git-
s
end-email: Do no
t
attempt t
o
S
TA
R
TT
L
S
m
ore t
h
a
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-03
Junio
C
Haman
o
Mer
g
e branch 'j6t/mingw'
commit
|
commitdiff
|
tree
2008-07-03
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-07-03
Juni
o
C Hamano
M
e
rge
b
r
a
nch 'js/maint-clone-insteadof' into maint
commit
|
commitdiff
|
tree
2008-07-03
Junio C Hamano
Mer
g
e branch 'jk/maint
-
fetch-ref
-
hier
'
in
t
o maint
commit
|
commitdiff
|
tree
2008-07-03
Junio C Haman
o
Me
r
ge branch
'
jc/m
a
int-r
e
set
'
i
nto
m
a
int
commit
|
commitdiff
|
tree
2008-07-03
S
h
awn
O
.
Pea
r
c
e
Fix describe --tags --long
s
o it does n
o
t segfa
u
lt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-02
Johannes Schind
e
lin
git fetch-pack:
d
o not com
p
lain about "no common comm
i
ts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-02
Brian
Gernhardt
Docume
n
tation: Point
t
o
g
itc
l
i(7) fr
o
m
g
i
t(1)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-02
Junio C Hamano
Update d
r
aft release notes for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-02
Nanako Shiraishi
gitcli: D
o
c
ument meaning
o
f --cach
e
d
a
nd --in
d
ex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-02
Jonathan Nieder
Documentation
f
ormattin
g
and cleanup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-02
J
o
nathan Ni
e
der
Docu
m
e
n
tat
i
on: be consis
t
ent about "git
-
" v
e
rsus
"git "
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-02
J
o
nathan Nieder
Docume
n
tatio
n
: prepare to be co
n
sistent a
b
o
u
t
"
g
it
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-02
Jonathan
N
ieder
git-daemon(1): don't assum
e
git-da
e
m
o
n is in /usr/bin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-02
Jonathan N
i
eder
Documentation: complicate exam
p
le
o
f
"man
g
it
-
co
m
mand"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-02
Jon
a
than Nieder
white
s
p
a
ce f
i
x in
Documentat
i
on
/
git-repack
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-02
Jonathan Nieder
D
o
cumentation:
fix links
to tuto
r
i
als an
d
oth
e
r new
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-02
Juni
o
C H
a
ma
n
o
Mer
g
e main
t
in
commit
|
commitdiff
|
tree
2008-07-02
J
unio C Hamano
Star
t
draft
release note
s
for 1
.
5
.
6
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-02
T
ho
m
as Rast
Fix
'git s
h
ow' on sign
e
d
t
ag o
f
s
i
gned tag of
com
m
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
J
u
nio
C Hamano
M
erge branch 'ph/mergetoo
l
'
commit
|
commitdiff
|
tree
2008-07-01
Junio C Hamano
Merge branc
h
'js/apply-recount'
commit
|
commitdiff
|
tree
2008-07-01
Junio
C Hamano
Merge branc
h
'jc/ch
e
ckdi
f
f'
commit
|
commitdiff
|
tree
2008-07-01
Ju
n
io C Ham
a
no
Mer
g
e branch '
k
b/sen
d
-email-fifo'
commit
|
commitdiff
|
tree
2008-07-01
Junio
C Hamano
Merge br
a
nch 't
r
/
s
end-email-ssl'
commit
|
commitdiff
|
tree
2008-07-01
Junio C Hamano
Merge branch 'js
/
maint-clone
-
instea
d
of'
commit
|
commitdiff
|
tree
2008-07-01
Jun
i
o C H
a
m
ano
Merge branch 'j
c
/
m
ai
n
t-reset'
commit
|
commitdiff
|
tree
2008-07-01
Junio C
Hama
n
o
Merg
e
b
r
an
c
h 'jk/maint-
f
etc
h
-
r
e
f-h
i
er'
commit
|
commitdiff
|
tree
2008-07-01
Junio C Ha
m
ano
Merge
b
ra
n
ch
'dz/a
p
ply-a
g
ain'
commit
|
commitdiff
|
tree
2008-07-01
Junio C Hamano
M
e
rge
b
ra
n
ch 'np/pack-def
a
ult'
commit
|
commitdiff
|
tree
2008-07-01
Junio C H
a
mano
Mer
g
e bra
n
ch
'
jc
/
dashless' (early
part
)
commit
|
commitdiff
|
tree
2008-07-01
Jun
i
o C Ham
a
no
Merge branch
'
nd
/
d
a
s
hless'
commit
|
commitdiff
|
tree
2008-06-30
Junio
C
H
a
man
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-06-30
B
r
i
an
G
ern
h
ardt
Add test r
e
sults
d
irectory to
t
/
.
gitignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
J
e
ff King
f
etch: give a hi
n
t to th
e
us
e
r when local refs fa
i
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Jeff King
doc/rev
-
parse: clar
i
fy
r
eflog
v
s --
u
ntil for
specifying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Hamano
Update draft releas
e
notes for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
jrnie
d
er@uchicago
.
e
d
u
Documentation
:
don't ass
u
me
gi
t
-sh-setu
p
and
g
i
t-pa
r
s
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
J
u
ni
o
C Ha
m
ano
t9700: s
k
ip wh
e
n Test::More
i
s
n
ot a
v
ailable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Johannes Sch
i
ndel
i
n
clone
:
r
espect the settings in $HOME/
.
g
i
tconf
i
g
a
nd
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Brian
G
ernhardt
Fix t
4
017
-
d
iff-ret
v
al for white-spac
e
fr
o
m wc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Junio C
H
am
a
no
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-06-29
Eric
W
ong
git-svn: don't san
i
ti
z
e
re
m
ote names in config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Olivier Ma
r
in
s
how_stats(): fix stats
w
idth calculation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
O
liv
i
er Marin
D
o
cumentation: remove {show,w
h
a
t
c
hange
d
}
.
difftree config
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Aver
y
Pennarun
g
it-svn: avoi
d
fill
i
ng up the disk with te
m
p fil
e
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Björn Steinbrink
git c
a
t-file:
Fix memor
y
leak in batch mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Thomas Ra
s
t
git-send-email: prevent unde
f
ined
varia
b
le warnings
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Joey Hess
fix git config example syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
J
ochen Voss
avoi
d
o
f
f-by-one error in run_uplo
a
d_a
r
c
h
ive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Lea Wiemann
GIT-VERSION-GEN: d
o
not fail if a 'HEAD'
file
exists
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Johannes Schind
e
lin
Allow gi
t
-apply to
recoun
t
the
l
i
nes in a
h
un
k
(AK
A
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Johanne
s
Schindel
i
n
c
o
mmit-tree: lift com
p
letel
y
a
r
b
i
trary limit
of 16
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
D
m
itry Pota
p
o
v
shrink git-she
l
l by avoiding
redundant dependencies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Christian Couder
hel
p
: check e
a
r
ly
if we
h
av
e
a comman
d
, if not try
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Do
n
Zicku
s
git-appl
y
: handle
a patch that to
u
ches the same path
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
J
eff King
fetc
h
: report local s
t
orage errors in statu
s
tab
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Johan
n
e
s Sch
i
ndelin
clone: respect url
.
i
nste
a
dOf setting in g
l
obal config
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Haman
o
D
o
cume
n
t the
double-das
h
"
r
e
v
-
-
pat
h
" dis
a
mbiguator
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Update
sample pre-commit hook
t
o use "diff --c
h
eck
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio
C Hamano
d
i
ff --check: de
t
ect leftover conflict markers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Ha
m
ano
Te
a
ch "diff --check
"
about new
b
l
a
nk
l
ine
s
at end
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
checkdiff: pass di
f
f
_
optio
n
s to the callback
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Ted
Percival
Don't use dash commands (gi
t
-fo
o
) in tutor
i
al-2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Lea Wiemann
tes
t
-
l
ib
.
sh: show git init outpu
t
when
in verbo
s
e mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
J
u
nio
C
Hamano
c
hec
k
_and_emit_
l
ine(): r
e
na
m
e and refactor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio C
H
a
mano
diff --check:
e
xpla
i
n why we do
n
ot care
w
he
t
her old
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio C H
a
man
o
M
erge branch
'
m
aint'
commit
|
commitdiff
|
tree
2008-06-27
Junio C H
a
mano
M
e
rge
b
r
a
n
ch 'main
t
-1
.
5
.
5' into
maint
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
GIT
1
.
5
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Juni
o
C H
a
mano
Mer
g
e br
a
nch 'm
a
int-1
.
5
.
4
' into m
a
int-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
Junio C Ha
m
a
n
o
GIT 1
.
5
.
4
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hama
n
o
g
it-shell: accept
"
git foo
"
form
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Ju
n
io C Hamano
diff --che
c
k: do not discard error sta
t
us
u
pon s
e
eing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
J
e
f
f
King
improve for-eac
h
-r
e
f t
e
st scr
i
pt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Jing
X
ue
Add '
g
it-p4
.
allow
S
ub
m
it' to g
i
t-p4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio
C Hamano
Start draft release
n
otes fo
r
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
D
m
i
try Potapov
upd
a
te-hook-ex
a
mple
:
optionally
a
llow
non-fast-forward
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Thomas
Ra
s
t
git-send-e
m
a
il:
a
dd support fo
r
T
L
S
via
N
et::SMTP::
S
S
L
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Kev
i
n Ballard
git-send
-
email
:
Acc
e
p
t
fifos as well as fil
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Nicolas Pitre
pa
c
k
.
indexversion config
o
ption now de
f
aults t
o
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Ju
n
io C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-26
Juni
o
C
H
amano
Al
l
ow "gi
t
-reset path" wh
e
n u
n
ambigu
o
us
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
A
l
ex R
i
esen
Fix u
s
e
of "perl
-
i"
o
n
Windo
w
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Juni
o
C
Hamano
GIT 1
.
5
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Me
r
ge branch 'sb/re
b
ase'
commit
|
commitdiff
|
tree
2008-06-25
Junio
C
Hamano
Merge
b
ranch 'lw/gitweb'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge
br
a
n
c
h 'lt/con
f
ig-fs
y
nc'
commit
|
commitdiff
|
tree
2008-06-25
J
u
n
io C Hamano
Me
r
g
e
b
ranch
'
sr/tests'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge branch 'jh/clone-packed-refs
'
commit
|
commitdiff
|
tree
2008-06-25
J
unio
C
Hama
n
o
Merg
e
bran
c
h 'lw
/
perlish
'
commit
|
commitdiff
|
tree
next