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
2009-06-03
Junio C Hamano
Mer
g
e
br
a
nc
h
'master' into
n
ext
commit
|
commitdiff
|
tree
2009-06-03
J
u
nio C Hama
n
o
Merge
br
a
n
c
h 'da/pretty
-
te
m
pname'
commit
|
commitdiff
|
tree
2009-06-03
Linus Torvalds
Clean up an
d
simplify rev_co
m
pare_tr
e
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
Junio
C Hamano
Mer
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2009-06-03
J
unio C H
a
mano
blame: correctly handle a path
that used to be a directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
Thomas Rast
a
d
d -i: do not dump pa
t
ch during ap
p
lication
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Juni
o
C
H
a
ma
n
o
Upda
t
e dra
f
t release
n
otes for 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Junio
C
Ham
a
n
o
Merg
e
branch 'cb/maint
-
1
.
6
.
0-xdl-
m
erge-fix' in
t
o maint
commit
|
commitdiff
|
tree
2009-06-02
J
u
nio C Haman
o
Merge branch
'rs/maint-grep-word-regexp-fix' i
n
to maint
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
Merg
e
bran
c
h 'sb/maint-1
.
6
.
2-opt-
f
ilenam
e
-fix
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-06-02
Jun
i
o C Hamano
M
erge
b
ranch
'j
c
/maint-add
-
p-coalesce-fix' i
n
to maint
commit
|
commitdiff
|
tree
2009-06-02
Junio C Ham
a
no
Merg
e
branch
'tr/maint-doc-stash-pop' into maint
commit
|
commitdiff
|
tree
2009-06-02
C
l
e
mens Buchacher
test-lib:
fix http exit codes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Clemens Buchache
r
test-lib: allow
e
x
i
t
trap to be
used for cleanup
b
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
C
l
emens Buchacher
te
s
t-lib:
fail if
i
nvalid options are pas
s
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
René Scharfe
grep: fix colouring of matches with ze
r
o
l
eng
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-01
Stephen Boyd
git-s
h
o
w
-branch
.
t
x
t: docume
n
t
--date-or
d
er
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
d
i
ff: generate pr
e
tty filenames in prep_temp_b
l
ob()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid A
g
uilar
compat:
add a basename() compatibil
i
ty functio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
la
r
comp
a
t
:
add a mkstemps() c
o
mpatibility function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
Junio C H
a
mano
Merge branch
'master' i
n
to next
commit
|
commitdiff
|
tree
2009-05-31
Junio C Hamano
Mer
g
e branch 'sb/opt-filename'
commit
|
commitdiff
|
tree
2009-05-31
Junio C Hamano
Merg
e
b
ranch 'jc
/
solaris-0
8
11'
commit
|
commitdiff
|
tree
2009-05-31
Junio C H
a
mano
Merge branch
'sb/s
h
ow-branch
-
parse-o
p
tions'
commit
|
commitdiff
|
tree
2009-05-31
Ju
n
io C
H
amano
Merge
b
ra
n
ch 'mm/ap
p
l
y
-double-sl
a
sh'
commit
|
commitdiff
|
tree
2009-05-31
J
u
n
i
o C Ham
a
n
o
M
erg
e
b
ranch 'sb/format-pa
t
ch
-
parseopt'
commit
|
commitdiff
|
tree
2009-05-31
Junio C
H
aman
o
Merge branch 'jc/mkt
r
ee
'
commit
|
commitdiff
|
tree
2009-05-31
J
u
nio C Hamano
Mer
g
e branch 'ew/svn-test-and-
o
l
d-i18n'
commit
|
commitdiff
|
tree
2009-05-31
Jun
i
o C Hamano
Merge branch 'mw/send-email'
commit
|
commitdiff
|
tree
2009-05-31
Ju
n
io C
Ham
a
no
M
e
rge branch
'cc/
b
isect' (
e
ar
l
y part)
commit
|
commitdiff
|
tree
2009-05-31
Jeff
Ki
n
g
git
-
add:
n
o need for -f when resolvi
n
g a conflict in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
S
tephen Boyd
config
.
t
xt: doc
u
ment
add
.
ignore-e
r
rors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
SZ
E
DER Gábor
ba
s
h: remove always true if
s
ta
t
ement fr
o
m __git_p
s
1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
Björn Steinbrink
git-apply(1): Clar
i
fy that
o
ne can
select where
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
Cleme
n
s Bu
c
hacher
http-push
:
reu
s
e
existing
i
s_null_ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
Junio C Hama
n
o
Merge branch 'ew/svn-
t
est-and-
o
ld-i18n' into
n
e
xt
commit
|
commitdiff
|
tree
2009-05-31
Eric Wo
n
g
t9139 uses ancient, ba
c
kwards-compatible iconv names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-31
Junio C
Hama
n
o
Merge git://git
.
bogo
m
ips
.
org/gi
t
-svn
commit
|
commitdiff
|
tree
2009-05-31
T
homas
R
ast
D
o
cumentation: t
e
ach sta
s
h/pop workflow instead of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-29
Junio C Hama
n
o
Me
r
ge branch 'sb/ma
i
nt-1
.
6
.
2-opt-filename-fix'
commit
|
commitdiff
|
tree
2009-05-29
J
unio C
H
amano
M
erge branch 'j
c
/maint-add-p-coalesce-fix'
commit
|
commitdiff
|
tree
2009-05-29
Junio C Hamano
Merge branch 'rs/m
a
int-grep
-
word-regexp-fix'
commit
|
commitdiff
|
tree
2009-05-29
Junio C Ha
m
ano
M
e
rge branch 'bc/old-iconv
'
i
nto ne
x
t
commit
|
commitdiff
|
tree
2009-05-29
Jun
i
o C Hamano
M
erge branch 'jc/mai
n
t-add-p-coal
e
sce-fix
'
in
t
o
next
commit
|
commitdiff
|
tree
2009-05-29
Junio C
H
amano
Merge
br
a
nch 'master' into
n
ext
commit
|
commitdiff
|
tree
2009-05-29
S
t
e
p
hen
B
oyd
t
9120:
d
on't expect failure with SVN
_
HTTPD_PORT unset
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-29
Thomas Rast
Docu
m
entat
i
on
:
teach stash
/
pop wor
k
flow
i
ns
t
e
a
d
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-29
J
u
n
i
o C Hama
n
o
M
erge bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2009-05-28
Clemens Buchacher
fix segfault show
i
ng an
empt
y
remote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-28
B
r
an
d
on Cas
e
y
t8005:
fix typo
,
it's IS
O
-8
8
59-5, not KOI8
-
R
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-27
Stephen Boyd
t5500:
M
odernize test styl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-27
J
unio C H
a
mano
compl
e
tion:
f
ix PS1
display during
an AM
o
n de
t
ac
h
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-27
Ben
j
amin Kra
m
er
imap-send
:
add sup
p
ort for I
P
v6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge bran
c
h
'jc/solari
s
-0811' into next
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
M
er
g
e bra
n
c
h 'jc/cache-tree' into next
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
io
C
Hamano
Mer
g
e bra
n
ch 'ma
s
ter' i
n
to n
e
xt
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
io C Hamano
Update draft release notes
t
o 1
.
6
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
H
a
m
an
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-05-26
Junio C
H
amano
Pre
p
a
r
e
f
or 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C Hamano
Me
r
ge br
a
nc
h
'js/maint
-
no-ln-a
c
ross-libexec-and-bin
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Me
r
ge
br
a
n
c
h 'lt/maint-diff-
r
e
d
uce
-
l
s
tat' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Haman
o
M
e
r
ge
b
ra
n
ch 'jm
/
f
o
rmat-patc
h
-no-auto-n-when-k-is-g
i
ven
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Me
r
ge bran
c
h 'do/maint-merge-r
e
cursive-fix'
i
nto main
t
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C Hamano
Merg
e
branch 'jk
/
maint-1
.
6
.
0
-tr
a
ce-argv' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
Hamano
Merge br
a
nch 'np/push-delta' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
H
a
m
ano
Merge branch 'ar/merge-one-file-diag' int
o
maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C H
a
m
a
n
o
Merge bra
n
ch 'ar/u
n
link-err'
i
nt
o
maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Me
r
g
e
bra
n
ch 'jk/maint-add-empty' into maint
commit
|
commitdiff
|
tree
2009-05-25
Jeff Ki
n
g
f
i
x cat-f
i
le usage messag
e
a
n
d documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fet
c
h: report r
e
f storage D
F
err
o
r
s
m
o
re accurately
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
lock_ref:
i
nform callers of unavailable ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Junio C Hamano
Avo
i
d "diff-inde
x
-
-cached" optimization under --find
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
J
unio
C
H
amano
O
p
t
imize
"
d
i
ff-ind
e
x
--
c
ach
e
d" using cache-tr
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Junio C Ham
a
no
t4007: moderni
z
e t
h
e s
t
yle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Junio C Hamano
cache-tree
.
c
:
:ca
c
he_tre
e
_find()
:
simplify in
t
ernal API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Jeff Ki
n
g
conver
t
bare readlink
to strbu
f
_readlink
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
J
o
hannes
S
i
x
t
t3701:
ensure
correct
l
y
s
et up reposit
o
ry after skipped
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Michael J Gruber
merge-o
p
tions
.
txt: Clarify
merge --squa
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
S
tephen Boyd
par
s
e-opts: add OPT_FI
L
E
N
AME and transition builtins
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Stephen Boyd
pa
r
se-opts:
p
r
e
pare
f
o
r
O
PT
_
F
I
LE
N
AM
E
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Junio C Hamano
Mer
g
e
branch
'j
c
/mktre
e
'
i
nto sb/opt-filename
commit
|
commitdiff
|
tree
2009-05-25
Ju
n
io C
Ha
m
an
o
Me
r
ge branch 's
b
/format-patch
-
parseopt' i
n
to sb/opt
.
.
.
commit
|
commitdiff
|
tree
2009-05-25
Juni
o
C Hamano
Merge branch
'sb/s
h
o
w
-
br
a
nch-p
a
rse-
o
ptio
n
s' into sb
.
.
.
commit
|
commitdiff
|
tree
2009-05-25
J
unio C H
a
mano
Me
r
ge br
a
nch 'master' into sb/opt-
f
ilename
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change xdl_mer
g
e
t
o
gene
r
ate output even for null
merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
C
h
a
r
l
es Baile
y
t6023: merge-fil
e
fails t
o
outpu
t
a
ny
t
hing for a d
e
generate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-24
Junio C
H
amano
Merge branch 'sb/maint-
1
.
6
.
2-opt-
f
ilename-fi
x
' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-05-24
Junio C Haman
o
Merge
branch 'sb/show-branc
h
-parse-
o
ptions' into
next
commit
|
commitdiff
|
tree
2009-05-24
Junio C Haman
o
M
e
rge branch 'mm/app
l
y-double-sl
a
sh' i
n
to next
commit
|
commitdiff
|
tree
2009-05-24
Junio C H
a
mano
Merge b
r
anch
'rs/ma
i
nt-grep
-
word-regexp-fix' into next
commit
|
commitdiff
|
tree
2009-05-24
J
u
nio
C
H
aman
o
Merg
e
br
a
n
ch 'da
/
araxis-
m
erge
t
ool' into next
commit
|
commitdiff
|
tree
2009-05-24
Junio
C
H
a
mano
Merge bra
n
ch 'sb/format-patch-parseopt' in
t
o next
commit
|
commitdiff
|
tree
2009-05-24
Ju
n
io
C
H
a
m
ano
Merge b
r
anch 'jc/mktr
e
e
' into
next
commit
|
commitdiff
|
tree
2009-05-24
Ju
n
io
C
Hamano
Merge bran
c
h 'mast
e
r' int
o
next
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Me
r
ge branc
h
'm
a
int-1
.
6
.
2' in
t
o maint
commit
|
commitdiff
|
tree
2009-05-24
J
unio C Hamano
Merge
branch '
m
aint-1
.
6
.
1' into
m
a
i
nt-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Junio C
Haman
o
Merge
branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-24
Michal
Marek
appl
y
:
handle filenames wi
t
h d
o
uble slas
h
es better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--l
i
b
:
add suppor
t
for araxis merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next