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 'master' into next
2011-01-21
J
o
nathan Ni
e
der
Docu
m
e
ntation:
d
o
not t
r
eat reset --keep a
s
a s
p
ecial
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-20
Björn Ste
i
nbrink
Correc
t
ly
repor
t
corrupt
e
d objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan
N
ieder
tes
t
s: co
m
press the setu
p
te
s
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jo
n
athan Nieder
tests:
cosm
e
tic im
p
rovements to the repo-setup test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
J
unio C Hamano
Merge branc
h
'm
a
int
'
commit
|
commitdiff
|
tree
2011-01-19
Erik Fay
e
-Lund
e
x
ec_cmd: remove unu
s
ed extern
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge br
a
nch
'jn/git
w
eb-no-log
o
' into maint
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
io C Hamano
M
erg
e
b
r
a
nch 'jk
/
diff-d
r
i
v
er-binary-doc' into maint
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio C
Hamano
Mer
g
e
b
ranch
'
tr/submodule-relative-scp
-
url' i
n
to maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge branch
'
rj
/
m
aint-difftool-cygwin-workaroun
d
'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hama
n
o
M
e
rge branch 'r
j
/
m
a
i
nt
-
t
e
st-fixes'
i
nto maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C
H
amano
Merge b
r
anch 'jn/maint-gitweb-pa
t
hinfo-
f
ix' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge branch 'ak/de
s
cribe-e
x
a
c
t' into ma
i
nt
commit
|
commitdiff
|
tree
2011-01-19
Juni
o
C Hamano
Merge
b
ranch
'jn/ma
i
nt
-
fast-import-o
b
ject-r
e
use' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio
C
Hamano
M
e
rge branc
h
'jn/sub
m
odule-b-current' in
t
o main
t
commit
|
commitdiff
|
tree
2011-01-19
J
unio C Hama
n
o
M
e
rge branch 'jc/maint
-
svn-i
n
fo-test-fix' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge bran
c
h 'nd/maint-relative' i
n
to maint
commit
|
commitdiff
|
tree
2011-01-19
Jon
a
than Nieder
Documentatio
n
/
fast-import: put explanation of M 040000
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Ramsay Jon
e
s
svndump
.
c: Fix a pr
i
ntf
for
m
at
c
o
mpiler warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan N
i
eder
r
emote-e
x
t:
d
o
not segfau
l
t for blank li
n
es
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonath
a
n Ni
e
d
e
r
Documen
t
ation/fast
-
import:
c
a
pitalize
b
eginning of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Ju
n
io C Hamano
t4034 (d
i
ff --w
o
rd-diff): add a minimum
Perl drie
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan Nieder
t4034 (diff --word-
d
iff): s
t
yle sugg
e
s
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jo
n
athan N
i
eder
user
d
iff: simplify word-diff safeguard
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Tho
m
as Rast
t
4034
:
bulk veri
f
y builtin wo
r
d reg
e
x sanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Ramkumar Ramachan
d
ra
fast-import: Intro
d
uce --im
p
ort-marks-if-exis
t
s
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-16
J
o
nathan Nieder
ll-merge: simp
l
ify
o
pts == NULL case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-13
Juni
o
C Hamano
Git
1
.
7
.
4-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-13
Jun
i
o
C Hamano
Merg
e
branch 'j
n
/gitweb-
n
o-logo'
commit
|
commitdiff
|
tree
2011-01-13
Junio C H
a
man
o
Merge b
r
anch 'j
n
/perl-funcna
m
e
'
commit
|
commitdiff
|
tree
2011-01-13
Junio
C
Hamano
Merge branch
'sr/gitweb-h
i
l
i
te-more'
commit
|
commitdiff
|
tree
2011-01-13
J
u
nio C
H
am
a
no
Merge b
r
a
nch 'rj
/
svn-test'
commit
|
commitdiff
|
tree
2011-01-13
Junio C Hama
n
o
Merge bran
c
h 'rj/
t
est-fixes'
commit
|
commitdiff
|
tree
2011-01-13
J
u
nio C
H
amano
Merge
b
r
a
n
ch 'jk
/
diff
-
driver-
b
inary-doc'
commit
|
commitdiff
|
tree
2011-01-13
Junio C
H
amano
Merge branch '
j
n/t9
0
10-work-a
r
ound-broken-svnadmi
n
'
commit
|
commitdiff
|
tree
2011-01-13
J
unio
C
Hamano
Merge b
r
anch 'tr/subm
o
d
u
le-rel
a
tive-scp-url'
commit
|
commitdiff
|
tree
2011-01-13
Mic
h
ael
J Gruber
RelNotes/1
.
7
.
4: minor fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-13
Thomas Rast
t
0
000: quote TAP
s
ni
p
p
e
t
s in test code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-13
J
o
nathan
Nied
e
r
u
npa
c
k
-
trees: ha
n
dle lsta
t
fa
i
lur
e
fo
r
e
x
i
s
ting file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-13
J
o
nathan Ni
e
der
u
npack-tr
e
es: ha
n
d
l
e
lstat failure for existing directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-13
J
u
nio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2011-01-12
Matthieu Moy
c
o
mmit: sugges
t
--amend --reset-author to fix commiter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-11
Junio C Ha
m
a
n
o
checkout: fix bug with ambiguous refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-11
Ramsay Jo
n
es
t9157-*
.
sh: Make
t
he sv
n
version c
h
eck more p
r
ecise
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-11
A
l
exey Shumkin
u
serdiff: match Pascal
class
m
ethods
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-11
J
o
hannes
S
ixt
t/README
:
hint about u
s
ing $(p
w
d
)
r
a
t
her than $PWD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-11
Johannes Sixt
Fix expected
v
alues of setup tests
on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-10
Junio C Ha
m
ano
M
e
r
ge branch
'm
a
int'
commit
|
commitdiff
|
tree
2011-01-10
Junio C Ham
a
no
M
e
rge branch
'
ma
i
nt-1
.
7
.
2' into maint
commit
|
commitdiff
|
tree
2011-01-10
Junio C Hamano
Mer
g
e branch 'ma
i
nt-1
.
7
.
1'
into main
t
-1
.
7
.
2
commit
|
commitdiff
|
tree
2011-01-10
Jun
i
o C
Ham
a
n
o
Merge b
r
an
c
h '
m
ai
n
t-1
.
7
.
0' into m
a
in
t
-1
.
7
.
1
commit
|
commitdiff
|
tree
2011-01-10
J
e
ff
K
ing
docs: ex
p
l
ain diff
.
*
.
b
ina
r
y option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-10
Jonathan Nieder
t
9
010: svn
a
dmin can fail
e
ven if
available
commit
|
commitdiff
|
tree
2011-01-10
T
h
o
mas Rast
submo
d
ule: fix relative url par
s
ing for scp-s
t
yle ori
g
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-10
Thoma
s
Rast
Document
a
tion/githooks
:
post-rewrite-copy-n
o
tes never
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-10
Thom
a
s Ra
s
t
Documentati
o
n/git-archi
v
e
:
spel
l
--worktree-attributes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-09
Junio C Hamano
Merge br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2011-01-09
Ramsay
Jones
t4
1
35-*
.
s
h
:
S
kip
t
he "backs
l
a
s
h
"
t
ests
o
n cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-09
Ramsay Jo
n
es
t3032
-
*
.
sh: Do not str
i
p CR
fro
m
line-endings w
h
ile
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-09
Ramsa
y
Jones
t3032-*
.
sh:
Pass the -b (
-
-binary)
op
t
ion to
s
ed on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-09
Ramsay Jones
t
6
0
38-*
.
sh: Pass the -
b
(
--
b
inary)
o
ption to sed on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-09
Ander
s
Kaseorg
Mark
g
i
tk s
c
ript execut
a
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-07
Erik Faye-Lund
alias:
u
se run_command a
p
i to execute
alias
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-06
Bran
d
o
n
C
asey
t3
0
32: lim
i
t sed
bran
c
h l
a
bels to 8 ch
a
ra
c
ters
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-06
B
randon Casey
t
0001,t1510,t3301: use sa
n
e_unset which always
returns
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-06
Brandon Casey
trace
.
c:
ensure N
U
LL is no
t
passed to printf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-05
Juni
o
C Hamano
Git 1
.
7
.
4-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-05
Ju
n
io C Hamano
Merg
e
branc
h
'maint' to sync with
1
.
7
.
3
.
5
commit
|
commitdiff
|
tree
2011-01-05
J
un
i
o C Hamano
Git 1
.
7
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-05
Junio C Hamano
Merge br
a
nch 'jn/svn-fe' (ear
l
y part)
commit
|
commitdiff
|
tree
2011-01-05
Junio
C Hama
n
o
Merge branc
h
'ao/t90
0
1-fix'
commit
|
commitdiff
|
tree
2011-01-05
Junio C Hamano
Merge b
r
a
n
ch 'pw/c
o
n
vert-
p
a
thname-substi
t
ution'
commit
|
commitdiff
|
tree
2011-01-05
Juni
o
C Ha
m
ano
Merge branch 'mg/cvsimpor
t
'
commit
|
commitdiff
|
tree
2011-01-04
Sylvain Rabo
t
g
i
tweb: remove unn
e
ce
s
sary
t
est whe
n
closing file d
e
sc
r
iptor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
Sylvain Rabot
gitweb: a
d
d exte
n
s
i
o
ns to highlight
f
e
atu
r
e map
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
Anton
i
o Osp
i
te
t/t9001-send-email
.
s
h: fix '&&' chain in some tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
Ramsay Jones
lib-git-svn
.
sh:
Move web-server handli
n
g code into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
Carlo
Marcelo Aren
a
s
.
.
.
setup: translate symlinks in
filen
a
me when using absolute
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
M
ichael J Gruber
cvsim
p
o
r
t: handle the parsing of uppercase con
f
i
g option
s
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
J
u
nio C
Hamano
unpack_trees(
)
:
sk
i
p trees that are the same in all
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-01-04
Jonath
a
n Niede
r
daemon: sup
p
o
rt <directory>
a
rguments again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
R
alf Wildenh
u
es
Fix typ
o
s in the docu
m
ent
a
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
J
o
n
athan
N
ieder
gitweb: make logo
optional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
Jo
n
athan Nie
d
e
r
gitw
e
b: ski
p
logo in atom fee
d
when
t
he
r
e is
no
n
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-29
Robin H
.
Joh
n
son
t9001: Fix test prereq
u
isites
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-28
Junio C Ham
a
no
Git 1
.
7
.
4-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-28
Ju
n
io C
H
aman
o
M
e
r
ge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-12-28
Junio C Haman
o
Prepare for 1
.
7
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-28
Junio C
H
amano
Merge branch
'jk/com
m
it-die-on-b
o
g
u
s-ident' into
m
aint
commit
|
commitdiff
|
tree
2010-12-28
Junio C H
a
man
o
M
e
rge branch 'ks/blame-wo
r
ktr
e
e-te
x
tcon
v
-cached' into
.
.
.
commit
|
commitdiff
|
tree
2010-12-28
Junio C
Hamano
Mer
g
e b
r
anch 'jc/m
a
in
t
-r
e
b
a
s
e-
r
ewrite-last-ski
p
' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-12-28
Junio C Hamano
Merge bra
n
ch 'j
c
/maint-
a
m
-
a
b
ort-safel
y
' into maint
commit
|
commitdiff
|
tree
2010-12-28
Junio C Hamano
Merge branch 'kb/
m
a
i
nt-s
t
atus
-
c
quote' into maint
commit
|
commitdiff
|
tree
2010-12-28
Jonathan Nieder
cherry
-
pic
k
/
rever
t
: add support
for -X/
-
-strategy-op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-28
B
randon Casey
t
9
0
01: us
e
older Getopt::Long bo
o
lean prefix '--no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-28
Junio C H
a
m
ano
M
e
rg
e
branch 'jc/mai
n
t-rebase-
r
ewrite
-
last-skip'
commit
|
commitdiff
|
tree
2010-12-28
J
u
nio C
H
amano
Merge branch 'nd/setup'
commit
|
commitdiff
|
tree
2010-12-28
Robin H
.
Jo
h
nson
F
ix false posi
t
ives in t3404 due to
S
H
E
L
L=/bin/false
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-27
Junio
C Ha
m
ano
u
s
erdif
f
/
p
erl: catc
h
B
E
GIN/END/
.
.
.
and POD as headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next