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 'vh/git-svn-doc' into maint
2011-05-15
Jun
i
o C Hamano
M
erge
bran
c
h 'vh
/
git-sv
n
-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
an
o
git_o
p
en
_
noat
i
me():
drop unused par
a
meter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1_f
i
l
e
: typ
o
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jo
n
athan Nieder
add, merg
e
,
diff: d
o
n
ot use
strcasec
m
p
t
o compare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Pr
e
pare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
mano
Me
r
g
e
bran
c
h 'aw/maint-rebase-i
-
p-no-f
f
' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge bran
c
h 'j
s
/blame-parsename' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
aman
o
Merge br
a
nch 'gr/cvs
i
m
p
ort-alternative-cvspass-locati
o
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge
bran
c
h 'cj/
p
4merge' into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merge branch 'jk/m
e
rge-one-file-wo
r
king-
t
re
e
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge branc
h
'jc
/
f
ix
-
d
iff-
f
iles
-
unmerge
d
' into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rg
e
branch
'mz/maint-r
e
name-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan
He
r
land
t5400: F
i
x a couple of
typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João B
r
itto
Remove
d
upli
c
ated
"is 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
Mic
h
ael J Gruber
git
-
fast-im
p
ort
.
txt: --relative-ma
r
ks takes no parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
s
h
e
ll: add missing initia
l
iz
a
ti
o
n of argv
0
_
p
ath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
B
rian Gernh
a
r
dt
t/
a
nnotate-t
e
sts:
Use echo & ca
t
instea
d
of s
e
d
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
H
amano
Merge branch 'jh
/
d
irstat' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Me
r
ge branch 's
p
/m
a
int-clear-postfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge b
r
anc
h
'jk/
m
a
i
nt
-
s
t
ash-oob
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
ranch '
j
k/maint
-
upload-pac
k
-shallow' i
n
t
o
ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merg
e
branch 'dm/sta
s
h-k-i-p
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io C Hamano
Merge bra
n
c
h 'jc/pa
c
k-objects-
b
igfile' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge branch 'mg/reflog-with-options'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch
'
jk
/
s
tash-loosen-sa
f
ety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C H
a
mano
Merge
bra
n
c
h
'ar/clean-rmdir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge
b
ra
n
ch 'mg/sha1-pa
t
h-advise' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Valenti
n
Haenel
git-
a
dd
.
txt: document '
a
dd
.
ignor
e
Er
r
or
s
'
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 empty file to p4merge wher
e
no b
a
se is suitab
l
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rou
i
l
l
ier
Look
fo
r
pass
w
or
d
in both CVS and CVSN
T
passwo
r
d files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one
-
fi
l
e
: fix broken m
e
rg
e
s with alternat
e
w
or
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add
t
ests for merge-in
d
ex / merge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C
Hamano
Start 1
.
7
.
5
.
1
maintenan
c
e
track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merge branch 'mg/x-years-12-months
'
into m
a
int
commit
|
commitdiff
|
tree
2011-04-29
Sylvai
n
Rabot
git-
s
end-email: fix missing space
i
n
error me
s
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame: tolerate bogus e
-
mail add
r
esses a b
i
t better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
A
n
d
r
ew Wo
n
g
git-rebase
-
-interactive
.
sh: p
r
eserve
-
merg
e
s fails on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin
H
aen
e
l
git-svn
.
txt: small t
y
p
eface imp
r
oveme
n
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Va
l
entin Haenel
git-
s
vn
.
t
xt
:
move option desc
r
ip
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
V
alentin Hae
n
el
g
it-svn
.
t
x
t: fix usage of --a
d
d-author-from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio C Hamano
http: cl
e
a
r POSTFIELDS when initi
a
lizing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio 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
dif
f
-files: s
h
o
w
unmerged e
n
t
ries correc
t
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C H
a
mano
diff: r
e
mo
v
e often unused parameters from d
i
ff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
dif
f
.
c
:
retur
n
filepair f
r
om dif
f
_
un
m
e
r
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
n
io C Hamano
tes
t
: use $_z40 from test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Gruber
date: avo
i
d "X years,
12 mo
n
ths
"
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 Hama
n
o
Sync
with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Juni
o
C Ham
a
no
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gru
b
er
g
it-svn
.
txt
:
Document --mergeinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
J
uni
o
C Hamano
Re
v
er
t
"run-command:
pr
e
ttify
-D_
F
ORTIFY_SOUR
C
E workaround"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
R
ené Scharfe
a
rchi
v
e: document limi
t
ation of tar
.
um
a
sk config
s
et
t
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Micha
e
l J
G
ruber
t3306,t5304: avoid c
l
o
c
k skew issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J
G
r
uber
gi
t
.
txt:
f
ix list c
o
ntinuation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
amano
Git 1
.
7
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o
C H
a
mano
Merge
b
ranch 'jc/rev
-
list-o
p
tions-fix' into
m
aint
commit
|
commitdiff
|
tree
2011-04-13
J
u
nio C H
a
mano
Merge branch 'j
s
/checkout
-
untracked-sym
l
ink' i
n
to
maint
commit
|
commitdiff
|
tree
2011-04-13
Jim M
e
yering
remove
d
oubl
e
d wor
d
s, e
.
g
.
, s/to to/
t
o/, and fix r
e
la
t
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ramkuma
r
R
a
m
ach
a
n
d
ra
revert: Hid
e
'-
r
' option in default
usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johan
Herland
--dirs
t
a
t:
In case of r
e
names, use
targ
e
t filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Mer
g
e bra
n
ch 'js/ch
e
ckout-untracked
-
symli
n
k'
commit
|
commitdiff
|
tree
2011-04-12
Junio C Ha
m
ano
M
erge
b
ra
n
ch 'nd/init-
g
itdir'
commit
|
commitdiff
|
tree
2011-04-12
Johannes Sixt
t2021: mar
k
a
tes
t
as fixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
n
e
s Sixt
t0001: guar
d
a new test with SYM
L
I
NKS pr
e
r
equisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
T
e
ach --dirstat not to
c
o
m
pl
e
tely ign
o
re rearranged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Æ
v
ar Arnfjör
ð
B
ja
r
mason
Makefile: ex
t
ract Q_() source s
t
r
i
n
gs as nge
t
text()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
R
amsay Jones
i18n: avoid parenthe
s
ized st
r
ing as
array initializer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--di
r
s
tat-by-file: Make i
t
fast
e
r and mo
r
e correct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n H
e
rland
--di
r
stat: Describe no
n
-obvious dif
f
erences rela
t
i
ve
.
.
.
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
M
e
rge
g
it://gi
t
.
b
o
gomi
p
s
.
o
r
g
/
git-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hamano
Merge
git://git
.
kernel
.
org/pub/scm/
g
itk/
g
itk
commit
|
commitdiff
|
tree
2011-04-07
Dan Mc
G
ee
s
t
ash: ensure
-
-no-keep-index and --p
a
tch
c
an be used
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Dan
M
cGee
stash: add two mo
r
e tests for --no
-
keep
-
index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Andrew G
a
rber
git-p4
:
replace each
t
ab with
8
spaces for c
o
nsistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
upl
o
ad-pa
c
k: start pac
k
-objects
before asy
n
c re
v
-list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
u
n
io C H
a
mano
Git 1
.
7
.
5
-
rc
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C Ha
m
ano
Sync with
1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio C Hamano
Git 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio C
H
a
m
a
n
o
Merge
branch 'nm/maint-conflicted-sub
m
odule-en
t
ries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io
C Hamano
M
e
r
g
e
branc
h
'mg/rev
-
list-n
-
reverse-doc' into
m
a
int
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge b
r
anch 'j
k
/
m
aint-re
m
ote-mirror-safer'
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o
C
H
amano
M
erg
e
bra
n
ch 'mg/doc-r
e
visi
o
ns-txt'
commit
|
commitdiff
|
tree
2011-04-06
J
eff King
s
t
ash:
dro
p
dir
t
y
worktr
e
e che
c
k on apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Teach core
.
bigfilethreashold to pack-objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jon Seymour
stash: f
i
x fals
e
p
o
s
iti
v
e in the invalid
r
ef test
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff
K
ing
stash: fix accidental apply of non-existent stash
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Michael
J Gruber
revisi
o
ns
.
txt:
language
i
mprovements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
J
u
nio C Hamano
Merg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2011-04-04
Ju
n
io C Hamano
Merge branch 'jl/subm
o
dule-fet
c
h-on-demand'
commit
|
commitdiff
|
tree
2011-04-04
Ju
n
io C Haman
o
Merge b
r
anch '
j
c/rev-l
i
st
-
options-fix'
commit
|
commitdiff
|
tree
2011-04-04
SZEDER
Gábor
Docu
m
e
n
tation: t
r
ivial grammar fix in core
.
worktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
J
akub Nar
e
bski
gitweb: Fi
x
parsing of neg
a
tive fractional
t
imezones
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Junio C
H
a
m
a
n
o
Merge bra
n
ch
'
nm/mai
n
t-c
o
nflicted-su
b
mod
u
le-e
n
tr
i
e
s
'
commit
|
commitdiff
|
tree
2011-04-03
J
u
ni
o
C Ham
a
no
M
e
r
ge b
r
an
c
h
'mai
n
t'
commit
|
commitdiff
|
tree
2011-04-03
J
unio C
H
amano
Start
p
r
e
pa
r
ing f
o
r
1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next