repo.or.cz
/
git
/
jrn.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
Ju
n
io C H
a
mano
Merg
e
bran
c
h
'
jc/t1506-shell-param-
e
xpansion
-
gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge bran
c
h 'jc/fix-add-u-unmerged' into
maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merge bra
n
ch 'jn/gitweb-depende
n
cy' into
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
ama
n
o
Mer
g
e branch 'jc/main
t
-bra
n
ch-mergeop
t
ions'
into
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge br
a
nch 'jc/mai
n
t-add-p-overl
a
pping
-
h
unks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Mey
e
ring
Documentation/git-fsck
.
txt:
fix typo: unreadable
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hama
n
o
Update draft r
e
lease notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
a
ma
n
o
Merg
e
branch 'cn/
f
orm
a
t-patch-quiet' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
i
o
C
Hamano
Merge b
r
anch 'jm/mergetool
-
subm
o
dules
'
into maint
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hama
n
o
Merge branc
h
'jk/format-patc
h
-
quote-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
M
erge bra
n
ch 'v
h
/gi
t
-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
git_open_noa
t
i
m
e(): dr
o
p un
u
sed p
a
ram
e
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1_file: ty
p
ofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nied
e
r
add,
merge
,
di
f
f
: d
o
not use strcasecm
p
to compare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
i
o C Ha
m
an
o
P
r
epare for
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hama
n
o
Merge
br
a
nch 'a
w
/m
a
int-re
b
ase-i-p-no-ff' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
Hama
n
o
Me
r
ge branch 'js/blame-p
a
rsename' into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Merge b
r
anch
'
gr/cvsimpor
t
-alternative-c
v
spass-
l
ocat
i
on
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge
b
r
anch 'cj/p4me
r
g
e
'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merge branch 'jk/me
r
ge
-
o
ne-file-w
o
rking-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
unio
C H
a
mano
Merge
b
r
a
n
c
h 'jc/
f
ix-diff-files-u
n
m
e
r
ged' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge branch 'm
z
/maint-ren
a
m
e-un
m
erged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
n
Herland
t5400: Fix a
co
u
ple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C Ha
m
ano
t
1
5
0
7:
av
o
id
"
${parameter
<
op>'word'}" i
n
side
d
oub
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Ham
a
no
t
370
1
: ad
d
-p-fix m
a
k
es t
h
e last test to pa
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebs
k
i
Remove gitweb/g
i
t
w
eb
.
cgi and other
l
egacy tar
g
ets from
.
.
.
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
Nareb
s
ki
git-instaweb
:
Simplify b
u
i
ld d
e
pendency on 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
unio C Hamano
merge: make branch
.
<name>
.
mergeoptions
c
orrectly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
oã
o
B
r
itto
R
em
o
ve d
u
plicated "is
a
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Jun
i
o C Ham
a
no
t3701: fix here docume
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Mic
h
ael J
G
r
u
ber
git-fast-import
.
txt: --relative
-
mark
s
t
a
k
es no p
a
ramet
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Shar
o
v
shell: add
m
issing initialization of argv0_pat
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhardt
t/a
n
n
o
ta
t
e-test
s
: Use
e
cho
& cat instead of 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
Jun
i
o
C Hamano
Merge branch 'jh/dirs
t
a
t' i
n
to main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Ha
m
a
n
o
Me
r
ge branch 'sp/maint-clear-
p
o
s
t
f
iel
d
s
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge branch 'j
k
/mai
n
t-stash-oob' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merge branch 'jk/maint-uplo
a
d-pa
c
k-
s
ha
l
low' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge bran
c
h 'dm/stas
h
-k-i
-
p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
ge br
a
nch 'jc/p
a
ck-
o
bjects-bigf
i
le' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
r
g
e branch 'mg/ref
l
og-with
-
options' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C
H
amano
Merge branch 'jk/st
a
sh-loosen-safety' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Ham
a
no
Mer
g
e branch '
a
r/clean-rmdir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branc
h
'mg/sh
a
1-path-advise' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Valen
t
in Haenel
git-add
.
t
xt
:
docu
m
e
nt 'a
d
d
.
i
g
noreEr
r
ors'
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
Pa
s
s e
m
p
t
y file to p4merge wher
e
no base is sui
t
a
ble
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Look f
o
r passw
o
rd in bo
t
h CVS an
d
CVSNT password file
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
m
e
rge-one-file:
f
ix broke
n
merges with alternat
e
work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
e
ff Kin
g
add tests fo
r
merge-index / mer
g
e-
o
ne-fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C
Hamano
"add -p": work-a
r
ound an
old lazines
s
th
a
t does n
o
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hama
n
o
add--inter
a
cti
v
e
.
pe
r
l:
fa
c
tor out repeated --recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t3701:
E
d
i
ting a split
h
unk in
a
n "add
-p" session
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C Hamano
add -p: '
q
' should
really quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
ni
o
C
H
amano
Start
1
.
7
.
5
.
1
maintenance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
ano
M
erge
b
ranch 'mg/x-years-12-months
'
into maint
commit
|
commitdiff
|
tree
2011-04-29
Sy
l
vain Rabot
git-send-email: fix missing space i
n
error
m
essage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
o
sh Stone
blame: tolerate bog
u
s e-mai
l
a
d
dresses a b
i
t
better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Won
g
gi
t
-
reba
s
e
-
-interactive
.
sh: preserv
e
-merges fail
s
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pretty: q
u
ote rf
c
8
22 special
s
i
n email addresses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
V
a
l
entin
Haenel
git-svn
.
txt:
s
mall typef
a
ce improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
txt: mov
e
opt
i
on descriptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin
H
aenel
g
it
-
s
v
n
.
txt: fix usage of --add
-
aut
h
o
r-fro
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio C Hamano
http: cle
a
r POSTFIELDS when
initializing a
s
lot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Haman
o
Gi
t
1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio
C
Ham
a
n
o
Fix "add -u" that someti
m
es fails to r
e
solve
u
n
m
e
r
ge
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Hamano
di
f
f-files: show unmerged en
t
ries correctl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C
H
amano
diff: re
m
o
v
e often
u
nused para
m
eters from diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff
.
c: retu
r
n filepair f
r
om diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Ham
a
n
o
test: use $
_
z40 from t
e
s
t
-li
b
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Mich
a
el
J
Gruber
date: avoid "X y
e
ars, 12 months" in relative dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Haman
o
Git 1
.
7
.
5-rc
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
H
aman
o
Sync w
i
th
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C H
a
mano
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-svn
.
txt: Document
--mergeinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Haman
o
Re
v
ert "run-
c
o
mmand: prettify -D_FORTIFY_SOURCE wo
r
k
around"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
Merge
bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2011-04-14
Re
n
é Sch
a
rf
e
archi
v
e: doc
u
ment lim
i
tation o
f
tar
.
u
mask
c
onfig setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
t3306,t5304:
a
void
c
lock
skew issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michae
l
J
G
ruber
git
.
txt: f
i
x
list cont
i
nuation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Juni
o
C
H
am
a
no
Git 1
.
7
.
5-rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
io C
H
ama
n
o
M
e
rg
e
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge branch 'jc/rev-list-
o
p
t
ions-fix'
into maint
commit
|
commitdiff
|
tree
2011-04-13
Junio
C Hamano
Merge br
a
n
ch 'js
/
checkou
t
-un
t
racked-sym
l
ink' into main
t
commit
|
commitdiff
|
tree
2011-04-13
Jo
n
a
thon M
a
h
mergetoo
l
: Teach abo
u
t submodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Jim Meyering
remo
v
e
d
o
ubled words, e
.
g
.
, s/t
o
to/to/, and fix
related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ram
k
umar Ra
m
ach
a
ndra
r
e
vert: Hide '-r'
o
pti
o
n in default
u
s
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Car
l
os Martín N
i
eto
format-
p
atch: document --quiet opt
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Ma
r
tí
n
Nieto
for
m
at-patc
h
:
don't pas
s
on
the -
-
quiet flag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herla
n
d
--dirs
t
a
t
: In case of
r
e
names, use target filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
J
unio C Hamano
Merge branch '
j
s/checkout-untracked-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Junio C
Hama
n
o
Merge branch '
n
d/init-git
d
ir'
commit
|
commitdiff
|
tree
2011-04-12
Johannes
S
ixt
t
2021: mark
a test
a
s
f
ixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
nne
s
Sixt
t000
1
: g
u
ard a new tes
t
w
i
th SYMLINKS prerequisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Her
l
and
Tea
c
h
--d
i
rstat no
t
t
o completely i
g
nore r
e
arranged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ævar Arnfjörð Bjarmaso
n
M
akefile: ext
r
act Q_() source
strin
g
s
a
s ngettext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay Jones
i18n: avoid parenthesized
str
i
ng as arr
a
y initializ
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Her
l
and
--dirstat-by-file:
M
a
k
e
i
t
fas
t
er
and
m
o
re c
o
rrect
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herlan
d
-
-
d
irstat: Describe non-ob
v
ious
d
i
fferences 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 Hamano
Merge git
:
/
/git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hamano
Merge git
:
//
g
it
.
kernel
.
org/pub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
next