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 'jn/gitweb-dependency' into maint
2011-05-16
Juni
o
C Hamano
Merge branch
'
jn/gitweb-d
e
p
e
ndency
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C
Hamano
Merge
bran
c
h
'
j
c/maint-branch-mer
g
eo
p
tions
'
into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Ha
m
ano
Me
r
ge b
r
an
c
h 'jc/maint-ad
d
-p-ove
r
lapping
-
hunks' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Documentation/git-fsck
.
tx
t
: fix typo: unreadable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
U
p
d
a
t
e
draft release notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio
C
H
ama
n
o
Merge
br
a
nch 'cn/format-patch-quie
t
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
Merge branch 'jm/me
r
getool-submodules' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
M
erge branch
'
j
k
/
f
ormat-
p
atch-quote
-
spec
i
al-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
Merge
b
ran
c
h 'vh/git-svn-doc' into
m
a
in
t
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
gi
t
_open_no
a
t
ime
(
)
: drop unused param
e
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
sha1_fi
l
e: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan
N
ied
e
r
add, me
r
ge, diff: do not
use st
r
cas
e
cmp t
o
compare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
P
repare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio
C
Haman
o
Merge bra
n
ch 'aw/
m
a
i
n
t
-rebase-i-p-no
-
ff'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Me
r
ge
branch 'js/blam
e
-
p
arse
n
ame
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge branch 'gr/cvsimport-alternative-cvsp
a
ss
-
locat
i
on
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge branch 'cj/p4me
r
ge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
Ha
m
a
n
o
Me
r
g
e
b
ranch 'jk/merge-
o
ne-file
-
working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e
b
ranch '
j
c/fi
x
-diff-files-unme
r
ged' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
M
e
r
g
e branch 'mz/maint
-
rename-unm
e
rged' into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Joha
n
Herla
n
d
t5400: Fix
a couple o
f
typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3701: add-p
-
fix makes the las
t
test to
p
a
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Ja
k
ub Narebski
Remove
gitweb/
g
itweb
.
cgi and ot
h
er legacy ta
r
gets from
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
git
-
instaweb: Sim
p
lify b
u
ild dependency
o
n
gitweb
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
merge: make branch
.
<name>
.
mergeopt
i
on
s
correctly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
oão Britto
Remo
v
e
duplic
a
ted "
i
s
a
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701: fi
x
her
e
document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael
J
G
r
u
ber
git-
f
as
t
-import
.
txt: --relative-
m
arks ta
k
e
s no p
a
rameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
shell: add mi
s
sing initialization of arg
v
0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhardt
t/annot
a
te-tests: Us
e
echo & c
a
t
instead o
f
sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
unio
C
Haman
o
G
it 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merge branch 'jh/dirst
a
t' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge branc
h
'
sp/maint-clea
r
-postfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C
H
amano
Merge
b
ranch
'jk/maint-sta
s
h-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
am
a
no
Merge b
r
anch 'jk/main
t
-upload-
p
ack
-
s
h
allow' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge branch 'dm/stash-k-i-
p
' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
Haman
o
Merge
branch 'jc/pack-obj
e
c
t
s
-bigfile'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C
H
amano
Mer
g
e
b
ranch 'mg/reflog-with-
o
ptions
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
Hamano
Mer
g
e b
r
anc
h
'jk/s
t
a
sh-loosen-saf
e
t
y' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge branch 'ar/clea
n
-rmdir-e
m
p
ty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'mg/sha1-path-
a
dvise
'
int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Val
e
ntin Ha
e
nel
git-add
.
t
xt: document 'add
.
ignoreE
r
rors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran Jessup
Pass
e
m
p
ty file t
o
p4me
r
ge where no
base
is
s
uitab
l
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy
Roui
l
li
e
r
Look
for passw
o
rd in both CVS a
n
d CVSNT pa
s
sw
o
rd files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-file: fix broken m
e
rges with alter
n
ate work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
a
dd tests
f
or merge-index / m
e
r
g
e-
o
ne-
f
ile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
H
a
m
ano
"ad
d
-p": work-aro
u
n
d an old la
z
iness
that does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add--interactiv
e
.
perl: fa
c
tor out r
e
p
e
at
e
d --r
e
count
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C Hama
n
o
t3701
:
Editing a split hunk in
a
n
"
add
-
p" sess
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
add -
p
: 'q'
s
hould rea
l
ly quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Start 1
.
7
.
5
.
1 m
a
intenance t
r
ack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
a
no
Me
r
g
e
branch 'm
g
/
x
-years-12
-
months' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-04-29
S
ylv
a
in Rabot
gi
t
-send
-
em
a
il:
fix missing space
in error mess
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame: to
l
erat
e
bogus
e
-mail address
e
s a bit bett
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andrew
W
ong
git-re
b
ase--int
e
ra
c
t
ive
.
sh: prese
r
v
e-merges fails on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff
K
ing
prett
y
:
q
uote rfc82
2
specials i
n
email addresses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Ha
e
n
el
git-svn
.
txt:
s
m
all
typeface
i
mprove
m
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
t
x
t:
move option descr
i
p
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valen
t
in Haenel
git-svn
.
txt: fix
usage of --add-author-
f
ro
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio C Hamano
h
t
tp: clear POSTFIELDS when in
i
tializing a
s
l
o
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hama
n
o
G
it 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Hama
n
o
diff
-
f
i
l
e
s:
s
h
ow unmerged entries co
r
rectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C
Ha
m
ano
diff:
r
emove often un
u
sed pa
r
ame
t
e
rs fro
m
diff_
u
nmerge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C
H
aman
o
d
i
ff
.
c: return filepa
i
r from diff_unm
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
n
i
o
C Hamano
test: use $_z40 from
t
est-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Mi
c
hael J Grub
e
r
d
a
te: av
o
id "X years,
12 month
s
" in
r
elative da
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Ham
a
no
Git 1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Syn
c
with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Ha
m
ano
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Mich
a
el J Gruber
git-s
v
n
.
t
x
t
:
D
ocument --merge
i
nf
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hama
n
o
Revert "r
u
n-command:
p
re
t
t
i
fy -D_FORT
I
F
Y
_SOU
R
CE workarou
n
d"
commit
|
commitdiff
|
tree
2011-04-14
Junio
C
H
amano
Merge br
a
nch 'maint
'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
a
r
c
h
ive
:
do
c
u
ment
li
m
i
t
ation of tar
.
umask config setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Grube
r
t3306,t5304:
avoid cloc
k
s
k
ew issue
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
git
.
txt: fix l
i
st continua
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
G
i
t
1
.
7
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
M
erge b
r
anch
'
main
t
'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Mer
g
e br
a
nch 'jc/rev-list-options-fix' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Hamano
Merge
branch 'js/checko
u
t-untracked-symlink' into ma
i
nt
commit
|
commitdiff
|
tree
2011-04-13
Jonathon Mah
merg
e
tool
:
Teach about submodule
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Jim
Meyerin
g
re
m
ove doub
l
ed words,
e
.
g
.
, s/to to/to/
,
a
n
d fix relate
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ramkum
a
r
R
a
ma
c
handra
revert: Hide
'
-
r
' o
p
ti
o
n in
default usag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Mart
í
n
N
ieto
format
-
patch: document --quiet opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Mar
t
ín N
i
eto
f
or
m
a
t-patch: don't pass on the --qu
i
et
f
lag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
-
-dirstat: In cas
e
of renames,
u
se
t
a
rget filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Ju
n
i
o
C Haman
o
Merg
e
bran
c
h 'js/
c
heckout-untracked-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merg
e
branch '
n
d/
i
n
it-gitdir
'
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n
n
es Sixt
t2021:
mark a
te
s
t as f
i
xed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
nn
e
s S
i
xt
t0
0
01: g
u
ard a n
e
w
t
est
w
ith SYMLIN
K
S prerequ
i
site
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Tea
c
h --dirstat
n
ot to
co
m
ple
t
e
l
y
i
gn
o
re rea
r
ra
n
ged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ævar Arnfjörð
B
jarmason
Makefil
e
: extract Q_() source
s
trings as n
g
e
ttext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay Jones
i
1
8n: a
v
o
id par
e
nthe
s
ize
d
s
t
ring as
array initializer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n
Herland
--di
r
stat-by
-
file: Make it faster and more correct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
and
-
-
d
irstat: Desc
r
ibe
no
n
-obvious difference
s
relative
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hama
n
o
Merge git://git
.
bogomips
.
org/gi
t
-
s
vn
commit
|
commitdiff
|
tree
2011-04-11
Ju
n
io
C Hamano
Merge
git:
/
/git
.
kernel
.
o
r
g/pub/scm/
g
itk/gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
stash:
ensure --no-keep-
i
n
d
e
x
an
d
--patch can be used
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Dan Mc
G
e
e
s
t
ash: add two more tests
f
or --n
o
-
keep-index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Andrew Garber
git-p4
:
replace eac
h
tab with
8
spaces f
o
r
c
onsistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
upload-p
a
ck:
s
tart pac
k
-objects before async rev-list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next