repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maint
2011-05-16
Junio C Hama
n
o
Merg
e
branch 'jc/t1506
-
she
l
l-par
a
m-expan
s
ion
-
g
o
t
c
ha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/fix-add
-
u-unmerged' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Merge branc
h
'jn/gitweb-de
p
endenc
y
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
'
jc/maint-
b
ranch-me
r
geoptions' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
a
n
o
Me
r
ge
b
r
a
nch 'jc
/
maint-add-p-
o
verlapping-hunks
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meye
r
i
n
g
Doc
u
menta
t
i
on/
g
it-fsck
.
txt: fix t
y
po: unreadable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
aman
o
U
pdate draft release no
t
es to
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
Merg
e
branch 'cn/format-patch-quiet'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
Merge branch 'jm/mergetool-subm
o
dul
e
s' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
io C Ha
m
ano
Merg
e
branch
'jk/form
a
t
-pat
c
h-quote
-
spec
i
a
l
-in
-
fr
o
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge b
r
anch 'vh/git-svn
-
doc' i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
git_o
p
e
n_noatime(): drop unus
e
d parame
t
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio
C
Hamano
sha
1
_
f
ile:
typof
i
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jon
a
than Nie
d
er
add, m
e
rge, diff: do not
use strcasecmp t
o
c
o
m
p
are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hama
n
o
Prepare for
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge
b
ranch 'aw/
m
aint-
r
ebase
-
i-p-no-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
Hamano
Merge
br
a
nch '
j
s/blam
e
-pars
e
name' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'gr/cvsim
p
ort-altern
a
ti
v
e-
c
vs
p
ass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merge
b
ranch 'cj/
p
4
merg
e
' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C
Hamano
Merge branch 'jk
/
me
r
ge-one-file-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Merg
e
b
r
anch 'jc/fi
x
-diff
-
files-unmerged' in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge branch 'mz
/
maint-rename-unmerged' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an H
e
rland
t5400:
F
ix a coupl
e
o
f typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C Hamano
t1507: a
v
oid "${
p
arameter<op>'word'}" inside double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Haman
o
t3701
:
a
dd-p-fix make
s
the last test to p
a
ss
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
R
e
move gitweb/
g
itweb
.
c
gi and other legacy targ
e
t
s 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 Na
r
ebski
git-
i
nstaw
e
b:
Simplify build
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
J
u
nio
C
H
a
m
a
no
merge: make branch
.
<nam
e
>
.
mergeoptions c
o
rrect
l
y o
v
er
r
ide
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
João Britto
Remov
e
duplicated
"
is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio
C
H
a
mano
t3701: fix
h
ere document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Mich
a
el
J
G
r
uber
g
i
t
-fast-
i
mport
.
txt: --relati
v
e
-
marks take
s
n
o
parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dim
a
Sharov
shell:
add missing i
n
itializa
t
i
o
n
o
f ar
g
v0
_
path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian G
e
r
nhardt
t
/
annotate-tests: Use
echo &
c
a
t
in
s
tead
o
f sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Git
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bran
c
h 'jh/dirstat'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merge branch 'sp/maint-c
l
ear
-
po
s
tfiel
d
s' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge branch 'jk/maint-stash-
o
ob' into
m
ain
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io
C
Hama
n
o
Merge branch 'jk/mai
n
t-upl
o
a
d
-
pack
-
s
ha
l
lo
w
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Ha
m
ano
Mer
g
e branch 'dm/stash-k-i-p' in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge b
r
anch '
j
c
/
p
a
ck-objects-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o
C Ham
a
no
Merge bran
c
h
'mg
/
refl
o
g-with-opt
i
ons' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge b
r
anch 'jk/stash-loosen-safety' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge branch
'
ar
/
cle
a
n-
r
m
d
ir-e
m
pty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
a
m
a
no
Merge branch '
m
g/s
h
a1-path-advise' into maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Hae
n
el
gi
t
-a
d
d
.
t
x
t:
document 'add
.
ignoreErrors'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Cia
r
an Jessup
Pass empt
y
file to p4merge where no base is s
u
ita
b
le
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy
R
ouillier
Loo
k
f
o
r
password in both CVS and C
V
SN
T
p
a
ssword files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merg
e
-
o
ne-file: fi
x
broken merges
w
ith alterna
t
e wo
r
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
eff King
add tests fo
r
merge-index / m
e
rge-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
n
i
o
C
Hamano
"add -
p
": work-ar
o
und an ol
d
laziness that does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hama
n
o
add--
i
nteractiv
e
.
perl: factor out r
e
peat
e
d
--recount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
amano
t
3701: Editing a sp
l
it hunk in an
"a
d
d
-p"
s
ession
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hamano
add -p:
'q' sh
o
uld rea
l
ly quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
Start 1
.
7
.
5
.
1 maintenance tr
a
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
n
o
Merge bra
n
c
h 'mg/x-y
e
ar
s
-12-months' i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-04-29
Syl
v
ain Rabot
git-
s
end-em
a
i
l
: fix missi
n
g space in er
r
or message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame: tole
r
ate bogus e
-
mai
l
ad
d
resses
a bit better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wong
g
i
t-rebase
-
-intera
c
tive
.
sh:
p
rese
r
ve-merges fails
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pretty:
quo
t
e rfc822 speci
a
ls
i
n email ad
d
resses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
n
tin Haenel
git-svn
.
txt: small typeface
i
mp
r
ovements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Vale
n
tin Haene
l
g
i
t-s
v
n
.
txt: move
o
ption des
c
riptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
V
alentin Haenel
g
i
t-svn
.
txt: fix usage
o
f --a
d
d-a
u
thor
-
f
rom
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Juni
o
C Hamano
ht
t
p: clear POSTFIELDS when initializi
n
g
a
slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Ha
m
ano
G
it 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
i
o C
H
a
ma
n
o
F
ix
"
add
-u" t
h
at sometime
s
f
a
ils to
r
e
so
l
ve un
m
er
g
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
H
a
m
a
n
o
di
f
f-f
i
l
e
s: show unmerged entries c
o
r
r
ect
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Hamano
di
f
f
: rem
o
ve
of
t
en unused parameters from dif
f
_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
d
iff
.
c: return fil
e
pair
fr
o
m diff_unm
e
r
g
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hama
n
o
test: u
s
e
$_
z
40 from
test-l
i
b
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Gruber
d
ate: avoid
"
X years, 12 months" in rela
t
ive
d
a
t
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
G
it 1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
H
a
m
an
o
Sync
w
ith 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Gi
t
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Michael
J Grub
e
r
git-svn
.
txt: Document --m
e
rgeinfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
J
uni
o
C Hamano
Revert "
r
un-com
m
and: prettify -D
_
FORTIF
Y
_SOURCE workaround"
commit
|
commitdiff
|
tree
2011-04-14
Junio C
H
am
a
no
Merge b
r
anc
h
'
m
aint'
commit
|
commitdiff
|
tree
2011-04-14
Re
n
é Scharfe
arc
h
i
ve: document
l
imitatio
n
of tar
.
umask conf
i
g setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael
J Gruber
t
3
30
6
,t5304: avoid clo
c
k skew issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Mic
h
a
e
l J Gruber
git
.
txt: fi
x
list continuation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Hamano
Git 1
.
7
.
5-
r
c2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
io C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
H
amano
M
erge branch 'jc/rev
-
list-o
p
t
io
n
s-fix'
i
nto maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge bra
n
ch '
j
s/checkout-untracked
-
symlink' into mai
n
t
commit
|
commitdiff
|
tree
2011-04-13
Jona
t
h
o
n Mah
m
er
g
etool: Tea
c
h abo
u
t sub
m
odul
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
i
m
M
ey
e
ri
n
g
r
e
m
ove
d
oubled wo
r
ds, e
.
g
.
, s/to to
/
to/, and fix re
l
a
ted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ra
m
kumar R
a
m
a
cha
n
dr
a
revert:
Hide '-r' option in
d
e
f
ault usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Martí
n
Nieto
format-patch: document
-
-quiet o
p
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Martín Ni
e
t
o
f
or
m
at-patch: don't pas
s
on
t
h
e --quiet fla
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
H
e
rland
--dirs
t
at: I
n
case of rename
s
,
u
s
e
target
filename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Junio
C
Ha
m
ano
Merge
b
r
anch 'j
s
/checkout-
u
ntracke
d
-sym
l
ink'
commit
|
commitdiff
|
tree
2011-04-12
Junio C H
a
mano
Merg
e
branc
h
'nd/init-g
i
t
dir'
commit
|
commitdiff
|
tree
2011-04-12
Johannes Sixt
t2021:
mark a test as f
i
xed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Johannes S
i
xt
t0001
:
gua
r
d a new tes
t
w
i
t
h SYMLINKS prerequisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herla
n
d
Teach
--
d
irstat not to comple
t
ely ignore r
e
arranged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ævar
A
rnf
j
örð
B
jarmason
M
a
kefile:
e
xtrac
t
Q_() source strings as n
g
ettext(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay Jone
s
i18n: avoid pare
n
thesized string as array initiali
z
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
h
a
n Herl
a
nd
--dirstat
-
by-file:
Make it faster and more c
o
rrect
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
--d
i
r
s
t
at: D
e
scribe non
-
obvious differ
e
nces relative
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
J
u
nio C Ha
m
ano
M
erge git
:
//git
.
bogom
i
ps
.
org/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio
C
Hama
n
o
Merge git://
g
it
.
ker
n
el
.
org/pub/
s
cm/
g
itk/gi
t
k
commit
|
commitdiff
|
tree
next