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 Haman
o
Merge branch 'jc
/
t
1506
-
shell-para
m
-expansi
o
n-g
o
t
c
ha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Haman
o
Merge branc
h
'
j
c/fix-
a
d
d
-u-unmer
g
ed' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Mer
g
e
b
r
a
n
ch 'jn/gitweb-dependency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'j
c
/mai
n
t-branch-
m
ergeoptions'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
m
a
no
Merge bra
n
c
h
'jc
/
m
aint-add-p-over
l
apping-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
im Meyering
Doc
u
me
n
t
a
tion/git-fsc
k
.
txt: fix
t
ypo: unrea
d
able -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
U
p
date draft release notes
t
o
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Merge branc
h
'cn/format-patch-quiet'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
M
e
r
g
e b
r
an
c
h
'jm/merg
e
tool-submodu
l
es' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge bra
n
c
h '
j
k/for
m
a
t
-pa
t
ch-q
u
ote-special
-
in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
un
i
o C Hamano
Merge branch
'
v
h
/git-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
J
unio
C Hama
n
o
git
_
o
pe
n
_noatime():
d
rop unused
p
arameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
sha1_fi
l
e: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jon
a
t
h
a
n Nieder
add,
m
e
r
ge,
di
f
f
:
do
not
use strcasecmp to c
o
mpare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Prepare f
o
r
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Merge b
r
anch 'aw/
m
ai
n
t
-rebas
e
-i-p-no-ff' into
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Me
r
ge br
a
n
ch 'j
s
/blame-pars
e
name' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge
b
r
an
c
h 'gr/cvsimport-a
l
ternative-cvspass
-
location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Ham
a
no
Mer
g
e branch 'cj/
p
4me
r
ge' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jk/merge-
o
n
e-f
i
le-wo
r
k
ing-
t
ree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merg
e
b
ra
n
ch 'jc/fix-diff-files
-
unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
un
i
o C Haman
o
Merge branch 'm
z
/
m
aint-ren
a
me-unme
r
ged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan He
r
land
t5400: Fix a couple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C Hamano
t15
0
7: avoid "${pa
r
a
m
e
ter<op>'w
o
rd'}"
inside doubl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t
3
701:
a
d
d
-p-fix makes the l
a
st
t
e
st to pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Nareb
s
ki
Remove gitweb
/
gi
t
web
.
cgi a
n
d
othe
r
legacy
t
argets f
r
om
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jak
u
b Nar
e
bski
git-insta
w
e
b: Simplif
y
bu
i
ld d
e
penden
c
y o
n
gitwe
b
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 Hama
n
o
m
e
rge
:
make branch
.
<na
m
e>
.
m
ergeoptions corr
e
ctl
y
overrid
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João Br
i
t
t
o
Remove d
u
p
li
c
ated
"
i
s
a
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio
C Hamano
t3701: fix here document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Mi
c
hael J Gruber
git-fast-i
m
p
o
rt
.
txt: --rel
a
tive-m
a
rks takes no pa
r
a
m
eter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
D
i
m
a
S
harov
shell: ad
d
missing
in
i
t
ialization of ar
g
v0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
B
rian Gernhardt
t/anno
t
ate-
t
ests: U
s
e
e
cho
& cat instead of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io
C
Haman
o
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge branch 'jh/dir
s
tat'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
ma
n
o
Merge branc
h
's
p
/m
a
int-clea
r
-postfields'
i
n
to
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
unio
C Hamano
Merge branch 'jk/maint-
s
tash-oob' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C
H
amano
Merge branc
h
'jk/maint-upload-
p
a
ck-s
h
allow' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
ge
branch 'dm/stas
h
-k-i
-
p' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C
H
amano
M
e
r
ge branch
'
jc/pack-o
b
j
e
cts-bigfile
'
int
o
main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
bra
n
ch 'mg/reflog-with-options' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge
b
ranch 'jk/stash-loosen-safe
t
y'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge br
a
n
ch 'ar/clea
n
-rmdir-empty' into main
t
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Ham
a
no
Merge br
a
nch 'mg/sha1-pat
h
-
a
dv
i
se' into maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Ha
e
nel
g
i
t-add
.
txt: do
c
u
m
ent
'
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
C
iaran Jessup
Pass em
p
ty
file to p4merge where no
base is suita
b
le
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
G
uy Roui
l
lier
Look for pass
w
or
d
in both CVS a
n
d CVSNT
pas
s
w
ord fil
e
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
m
e
rge-one-file: f
i
x broken merges wi
t
h alter
n
a
te work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
e
f
f King
a
d
d tests
f
or mer
g
e-
i
nd
e
x / merge-on
e
-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
"add -p": work-aro
u
nd an ol
d
laziness that
do
e
s no
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hamano
add--interactive
.
per
l
:
f
actor out repeated -
-
recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hama
n
o
t3701:
E
diting a split hunk in an
"add -p" ses
s
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
a
d
d -p
:
'q' sho
u
l
d really quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Hamano
Start 1
.
7
.
5
.
1 ma
i
ntenance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
a
mano
Merge bran
c
h
'm
g
/x-years-12-m
o
nths' into
maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-send-email: fix missing space
i
n err
o
r
m
e
s
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
b
lame: to
l
er
a
te bogus e-ma
i
l addres
s
e
s
a bit b
e
tter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
A
ndrew Wong
git-rebase--interactive
.
sh: preserve-merge
s
fails on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff Kin
g
p
retty
:
quote rfc822 specials in email address
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valen
t
in Haenel
git-svn
.
txt: small typefac
e
imp
r
o
v
e
ments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
V
alent
i
n Hae
n
e
l
git-
s
vn
.
txt: move option description
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
V
alen
t
in Haene
l
g
i
t-svn
.
t
x
t: fi
x
us
a
g
e
of --
a
d
d-author-f
r
om
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
J
u
n
io C Hama
n
o
ht
t
p: clear P
O
S
T
FIEL
D
S when initializing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
no
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Fix "add -u" that somet
i
m
e
s fails to resolv
e
unme
r
ged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio
C
Ha
m
ano
d
i
f
f-files: show unme
r
ged
e
ntries correc
t
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Hamano
diff: remove often unuse
d
parameters fro
m
diff
_
unm
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
d
i
ff
.
c: return fil
e
pair fro
m
d
iff_un
m
erge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
n
o
test: use $_z40
from tes
t
-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Mi
c
ha
e
l
J Gr
u
ber
date: a
v
oid "X years, 12 months"
in relative dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io 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
H
am
a
no
Sync with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
i
o C
H
amano
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Mic
h
ael J Gru
b
er
gi
t
-
s
vn
.
txt: Document --mergeinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Ham
a
no
Revert "run
-
com
m
and
:
prettify -D_F
O
RTIFY_SOURCE workaro
u
nd"
commit
|
commitdiff
|
tree
2011-04-14
Junio
C Hamano
M
erge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
a
rchive: doc
u
m
e
nt
l
imitation
o
f tar
.
umask config set
t
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
t
33
0
6,t5304
:
avoid cloc
k
s
k
ew
issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
M
i
c
hael J Gruber
gi
t
.
t
xt: fix list continu
a
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Haman
o
Git
1
.
7
.
5-
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge b
r
anch
'jc/rev-
l
ist-options-fix'
i
n
to maint
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Hamano
Merge bran
c
h 'js/
c
he
c
kout-untracke
d
-s
y
mlink' into maint
commit
|
commitdiff
|
tree
2011-04-13
Jonathon Mah
m
er
g
et
o
ol: Tea
c
h about sub
m
od
u
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Jim Meyering
rem
o
ve doubled w
o
rds,
e
.
g
.
, s/to to/to/, and
fix r
e
la
t
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar Ramac
h
andra
revert: Hide '-r'
op
t
i
on in default
usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
C
arlos Martín Nie
t
o
f
o
rmat-patch: docum
e
nt -
-
q
ui
e
t option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
C
a
rl
o
s Ma
r
tín Niet
o
form
a
t-
p
atch: do
n
't p
a
ss
o
n the --quiet flag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
H
e
rland
--d
i
rstat
:
In case of r
e
n
ames, use target filenam
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hama
n
o
M
e
rge branch 'js/checkout-un
t
racked-syml
i
nk'
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge
b
ranch
'nd/init-gitdir'
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
ne
s
Sixt
t2021: m
a
rk a test
as
f
ixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johannes Sixt
t0001: guard a
new test w
i
th SYMLINKS prerequisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
nd
Teach --dirstat not to completely ig
n
or
e
rearranged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ævar Arnfjörð Bjarmason
Makefile: extract Q_() source
s
trings as n
g
e
t
text()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ra
m
say Jones
i18n: avo
i
d parenthesized strin
g
a
s array initiali
z
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirsta
t
-by-fi
l
e: Make
i
t
faster and more correct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-di
r
stat: Des
c
ribe non-ob
v
ious differences 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 Haman
o
Merge gi
t
:/
/
git
.
bogomips
.
o
r
g/git-s
v
n
commit
|
commitdiff
|
tree
2011-04-11
Junio C Haman
o
Merge git://git
.
kernel
.
o
r
g/pu
b
/scm/
g
i
t
k/gitk
commit
|
commitdiff
|
tree
next