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 'maint'
2008-03-15
Junio C Haman
o
Merge
branch 'maint
'
commit
|
commitdiff
|
tree
2008-03-15
Junio C Hamano
format-patch: g
e
nerate MIME header as
n
ee
d
e
d ev
e
n
w
hen
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-03-15
Jonas
F
onse
c
a
Make m
a
n
p
age building q
u
i
e
t when
DO
C
BOOK_XSL_1
7
2 is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Ber
n
t Hans
e
n
g
i
t
-
ne
w
-
wo
r
kdi
r
: Share SVN meta data
betwe
e
n
w
ork dirs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Linus T
o
rvald
s
Fix rec
e
nt 'unp
a
c
k_t
r
ees()'-related chan
g
es br
e
aking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Linus Torvalds
rev-parse: fix meaning of
r
e
v~ vs rev~0
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Eri
c
W
o
ng
git-s
v
n: don
'
t
blindly append '*' to branch/ta
g
s c
o
nfig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Jun
i
o C Hamano
M
e
rge git://git
.
kernel
.
o
rg/pub/s
c
m/gitk/gitk
commit
|
commitdiff
|
tree
2008-03-14
Chri
s
tian Coud
e
r
Doc
u
m
ention:
w
eb--browse: add in
f
o about
"browser
.
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Christi
a
n Couder
w
e
b--brow
s
e
:
u
s
e
custom comman
d
s
d
efi
n
e
d
at co
n
f
i
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Junio C Hamano
Merge bra
n
c
h
'mr/autoconf-f
r
e
a
d'
commit
|
commitdiff
|
tree
2008-03-14
Junio
C
Hamano
Merge
b
ranch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-03-14
Junio C
Hamano
Merge
branch 'ph/maint-quiltimport' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2008-03-14
Junio C Hamano
read-t
r
ee() an
d
unpack_tr
e
es(): u
s
e
con
s
i
stent
l
im
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Johannes S
c
hind
e
l
in
merge-file: handle empty files gra
c
e
fully
commit
|
commitdiff
|
tree
2008-03-14
C
lemens Bu
c
hacher
me
r
ge-recursive
:
handle fil
e
mo
d
e chang
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Nicola
s
Pi
t
re
pac
k
-obje
c
ts: proper pack t
i
me
sta
m
ping w
i
t
h --m
a
x
.
.
.
commit
|
commitdiff
|
tree
2008-03-14
Vineet Kumar
M
i
nor wo
r
ding ch
a
nge
s
in the keyboa
r
d des
c
ri
p
tio
n
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Johannes Schindeli
n
g
it
f
etch: Take
'
-n'
t
o
mean '--no-tags'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Junio C
Hamano
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2008-03-13
Johannes Schindeli
n
gc: cal
l
"
prune --expire 2
.
weeks
.
ag
o
" by
d
efault
commit
|
commitdiff
|
tree
2008-03-13
Jun
i
o C Ham
a
no
Documen
t
atio
n
/
c
onfig:
typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Junio C Hamano
quiltimport: fix misquoting
o
f par
s
ed
-
p<
n
um>
para
m
eter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Marc-Andre
L
u
r
e
au
git-cvsimport: fix
m
e
r
ging with
r
e
mote pa
r
en
t
branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
J
a
kub
N
ar
e
b
s
ki
gitweb:
F
ix bug in
h
ref(
.
.
.
,
-
replay=>1) when usi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Ju
n
io C Haman
o
Me
r
ge git://repo
.
or
.
c
z
/git-gui
commit
|
commitdiff
|
tree
2008-03-12
J
u
nio C Hamano
Merge
b
ranch 'js/remote'
commit
|
commitdiff
|
tree
2008-03-12
Ju
n
i
o
C Hamano
M
e
r
g
e branch 'lt/un
p
ack-tr
e
es'
commit
|
commitdiff
|
tree
2008-03-12
Samue
l
Tardi
e
u
"remote update": print remo
t
e
n
ame being fetch
e
d
from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Junio
C
Hamano
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2008-03-12
Marc-Andre Lureau
gi
t
-svn:
f
ix fin
d
-r
e
v error mess
a
ge whe
n
missing
arg
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
J
e
ff King
t0021: tr por
t
ability fix for Solaris
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Johannes Sch
i
ndelin
laun
c
h_ed
i
t
o
r()
:
a
llow spaces in the
f
il
e
na
m
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Mike
H
omme
y
g
i
t
rebase --
a
bort: always restore the right commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-11
Michal Ro
k
os
a
u
t
oconf: Test FREAD_READS
_
D
I
RECTORIES
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-11
Jun
i
o C Hama
n
o
Merge branch 'jc/cherry-pick' (e
a
r
ly p
a
rt)
commit
|
commitdiff
|
tree
2008-03-11
Junio C
Ha
m
ano
Merge
b
ranch
'
m
a
int'
commit
|
commitdiff
|
tree
2008-03-11
Junio C Hamano
Merg
e
b
ranch 'kb/
m
aint-filter-branch
-
disappear' into
.
.
.
commit
|
commitdiff
|
tree
2008-03-11
Junio C Hamano
M
erg
e
branch 'aw/m
a
int-shortlog-
b
la
n
k-l
i
nes' into maint
commit
|
commitdiff
|
tree
2008-03-11
Linus Torval
d
s
unpa
c
k
_trees(): fix
d
iff-index regression
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-11
SZEDER Gábo
r
u
pdate 'git rebase' documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
Ju
n
io C Ha
m
ano
tr
a
v
erse_trees_recursive(): propagate merge errors up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
Junio C Hama
n
o
git-p
u
ll documentatio
n
:
warn about
t
he o
p
tion orde
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
P
ierre Habouzit
git-quiltimpo
r
t: bet
t
er p
a
r
ser to
g
rok
"e
n
hanc
e
d"
s
er
i
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Lin
u
s Torvalds
u
n
p
ack
_
tr
e
es():
mino
r
m
emory leak
f
ix in un
u
sed de
s
tination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus T
o
r
valds
Make 'un
p
ac
k
_tr
e
es()' have a separa
t
e source an
d
destination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torva
l
d
s
M
a
k
e 'u
n
p
a
ck_trees()
'
tak
e
the
index to work
o
n
as
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
i
nu
s
Torvalds
Add 'const' where appropriate to index handling functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
i
n
us To
r
vald
s
Fi
x
tre
e
-walking compare_
e
n
try()
i
n the prese
n
se of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Move 'u
n
pack_trees
(
)'
o
v
er t
o
't
r
averse_
t
rees()' i
n
terfac
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
M
a
ke
'trav
e
rse_t
r
ees(
)
'
trave
r
se
conflicting
D
F ent
r
ie
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Add
r
eturn value
to
'
trave
r
s
e_tre
e
(
)
' c
a
llbac
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus T
o
rvald
s
Make
'
tra
v
erse
_
tree()' use
l
inked struc
t
ure rather
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
inus T
o
r
val
d
s
Ad
d
'df_name_compare()' helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
J
ohannes
Schin
d
elin
buil
t
i
n
r
e
mote
r
m
: remove symbolic refs
,
too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Jeff K
i
n
g
A
dd a test for r
e
ad-tre
e
-
u
--res
e
t w
i
th a D/F
c
o
nfl
i
ct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o C Hama
n
o
Me
r
ge branc
h
'
ph/parseopt'
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio C Ham
a
n
o
Merge
b
ran
c
h '
d
p/clean-fix'
commit
|
commitdiff
|
tree
2008-03-09
Junio C H
a
mano
Merge b
r
anch
'
m
l/s
u
bmodule-ad
d
-existi
n
g'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C Hamano
M
er
g
e branch 'mr/
c
om
p
at-snpr
i
ntf
'
commit
|
commitdiff
|
tree
2008-03-09
Juni
o
C Ha
m
ano
M
erge branch
'sp
/
fetch-
o
ptim'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
Haman
o
Merge branch 'jc/descr
i
be-alwa
y
s
'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C Hamano
Me
r
ge branch 'jc/a
m
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C
H
a
mano
Merge
b
r
a
nc
h
'cr/reset-parseopt'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o
C
Hamano
Merge br
a
nch '
j
n/git
w
eb-pickaxe'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C Hama
n
o
Merg
e
branch 'kb/maint-filter-branch-di
s
appe
a
r
'
commit
|
commitdiff
|
tree
2008-03-09
J
unio C Hamano
Me
r
ge
b
ranch 'maint'
t
o sync
w
ith 1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
J
u
n
i
o C Hamano
GIT 1
.
5
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Santi B
é
ja
r
ident
.
c: rew
o
rd er
r
or message when the user
n
ame cannot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
John Goerzen
Fix
d
commit, rebase when r
e
wr
i
teRoot
is in use
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
Hama
n
o
filter
-
bra
n
ch: handl
e
"dis
a
p
pearing tre
e
" case correctly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Charles Ba
i
ley
merge
-
to
o
l docume
n
tation: describe custom command
usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
C
harles Bailey
git-mergetool
documentaiton: sho
w
t
o
olna
m
es
in
type
w
riter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Adeod
a
to S
i
mó
Rea
l
ly make t
h
e
LF after r
e
set in fast-
i
m
port op
t
ional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io C Hama
n
o
Mer
g
e bran
c
h
'
a
w/maint-sho
r
t
l
og-b
l
ank-lines'
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C Hamano
Merge bran
c
h
'
mh/maint-http-proxy-
f
ix' into m
a
int
commit
|
commitdiff
|
tree
2008-03-08
J
unio
C
H
a
mano
Mer
g
e br
a
nch 'js/m
a
int-daemon' into
m
a
int
commit
|
commitdiff
|
tree
2008-03-08
Junio C
H
amano
Merg
e
b
r
anch 'js/mai
n
t-cvsexpor
t
'
into maint
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
Hamano
M
e
rge branch '
j
c
/maint-
l
og
-
merge-left-right'
int
o
maint
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge branch
'
ew/maint-
s
v
n
-
cert
-
filepr
o
vider' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C Hamano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
s
e
n
d-email:
-
-no-signed-off-cc should
s
uppress 'sob' cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Juni
o
C Ha
m
ano
Merge branch 'js/reflog-
d
elete'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge branch 'dc/fo
r
m
a
t-prett
y
'
commit
|
commitdiff
|
tree
2008-03-08
J
u
ni
o
C
H
amano
Merge
b
r
anc
h
'
c
b/me
r
g
e
tool'
commit
|
commitdiff
|
tree
2008-03-08
Juni
o
C Hamano
git-clean:
a
dd
tests for r
e
lative path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmitry
Potapov
git
-
clean: corr
e
ct pri
n
ting rela
t
ive path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmitry Potapov
Make
privat
e
q
uote_path()
i
n wt-st
a
tus
.
c
av
a
ilable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Pierre Habouzit
u
n
q
u
o
t
e_c_style: fix o
f
f-by-o
n
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
J
unio C Hamano
test-lib: fix TERM
t
o dumb
for test repeatability
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
U
we Kleine-König
conf
i
g
.
tx
t
: refer t
o
--upload-pack and -
-
receive-pack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Jun
i
o
C
H
a
mano
Merge branch 'ar/sgid-bsd'
commit
|
commitdiff
|
tree
2008-03-07
Junio C H
a
ma
n
o
Mer
g
e branch 'c
c
/run-com
m
and'
commit
|
commitdiff
|
tree
2008-03-07
Junio
C
H
ama
n
o
Rever
t
part of d
0
89eb
a
(setup: sanitize abso
l
ute an
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio
C
Ha
m
ano
Revert part
o
f 1abf0
9
5
(
git-add:
a
dju
s
t t
o
the get_path
s
pec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
J
u
ni
o
C Hamano
Rev
e
rt p
a
rt
of 744dacd (
b
uiltin-mv: minimum fix to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C
Hamano
get
_
paths
p
ec(): di
e
when an out-of-tr
e
e pa
t
h is given
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-06
Junio C
H
a
mano
Me
r
ge branch 'maint' of git://repo
.
or
.
cz/g
i
t-gui into
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
Ja
k
ub
N
arebski
gitweb: Fix and simplify pic
k
axe search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next