repo.or.cz
/
git
/
mjg.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
Junio C Ham
a
n
o
Merge branch 'vh/
g
it-svn-doc'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
git
_
open_n
o
atime():
d
r
op u
n
used parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hama
n
o
s
ha1_f
i
le: ty
p
ofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan N
i
eder
add, me
r
g
e, diff: do not use strcasecmp
to com
p
ar
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Prepare for
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merge branch 'aw/mai
n
t-rebase-i-p-no-ff'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge branch 'js
/
blame-
p
arsename' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Me
r
g
e
branch 'gr/cvsimport-
a
lternative
-
cvs
p
ass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ranch 'cj/p4merge' into main
t
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Merge branch 'jk/m
e
r
ge-on
e
-f
i
le-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
n
o
Merge
b
ranch
'
jc/fix-diff-files-unme
r
ged' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Ha
m
a
no
Mer
g
e branch 'mz/maint-rename-u
n
m
er
g
ed'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herla
n
d
t5400: Fix a couple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João Br
i
tto
Remove duplicated "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ha
m
ano
t3701: fix here document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gr
u
ber
g
it-fast-import
.
tx
t
: -
-
rela
t
ive-marks takes no param
e
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
s
h
ell:
a
d
d missi
n
g in
i
tializat
i
on
of argv
0
_
p
ath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian
Gernha
r
dt
t/a
n
no
t
ate-tests: Use e
c
h
o
& cat instead of
s
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
G
it 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'j
h
/di
r
s
t
at' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Me
r
g
e
branc
h
'
sp/maint-clear-postfi
e
lds' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
unio
C Ham
a
n
o
Merge branch 'jk/main
t
-stas
h
-o
o
b
'
into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o
C
Hamano
Merge branch 'jk/maint
-
u
pl
o
ad
-
pack-shallow'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge
b
r
anch 'd
m
/stas
h
-k-i-p' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
a
m
a
n
o
Merge branch
'
jc/pac
k
-objects-bigfile'
into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Me
r
ge bran
c
h 'mg/reflog-
w
ith-op
t
ions
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C
Hamano
M
e
r
g
e b
r
a
n
ch '
j
k/stas
h
-loo
s
en-safety' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
mano
Me
r
ge
b
ranch 'ar/c
l
ean-rmdir-empty' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merg
e
bra
n
ch 'mg/sha1-path-advise' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Valent
i
n Haenel
git-add
.
txt: document 'add
.
ign
o
reError
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
f
i
l
e to
p
4merge
w
here
no
b
ase i
s
su
i
table
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rou
i
llier
Lo
o
k f
o
r
p
assword in
b
oth CVS and CV
S
NT password fi
l
es
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
King
merge-one-file:
fix b
r
oken
me
r
ges with
alt
e
r
na
t
e work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add tes
t
s f
o
r
m
erg
e
-inde
x
/ merge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C
Hamano
S
t
art 1
.
7
.
5
.
1
maint
e
nan
c
e
track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hamano
Mer
g
e branch 'mg/x-years-12-m
o
nths' in
t
o maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-send-e
m
ail: f
i
x missing
space
i
n e
r
ror messa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame:
t
oler
a
te
b
o
gus e-mail ad
d
r
e
sse
s
a
b
it
b
etter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
An
d
rew Wong
git-rebase--interactive
.
s
h
:
p
r
eserve-merges fails
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
txt: s
m
all
t
ypeface improv
e
ments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valenti
n
Haenel
git-svn
.
tx
t
: move option descriptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valenti
n
Haen
e
l
git-
s
v
n
.
tx
t
: fix usage of --add-au
t
hor-from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio C
H
amano
h
t
tp: clear PO
S
T
F
IELDS
w
hen i
n
itializ
i
ng a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hama
n
o
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff-files:
s
how unmerged entries co
r
rectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
amano
diff: re
m
ove of
t
en unused par
a
m
eters from dif
f
_
unmerg
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hama
n
o
diff
.
c
:
r
e
t
urn filepai
r
from diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ha
m
ano
t
e
st: use $_z40
from
t
est-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
M
ich
a
el
J
Gruber
date:
avoid
"
X
years, 12 m
o
nth
s
" in rela
t
ive dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io C Hamano
Git 1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Jun
i
o C
Hamano
Sync with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C
H
a
m
a
no
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gruber
gi
t
-
s
vn
.
txt: Docum
e
nt --mergeinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
J
u
n
io C
Hamano
Revert "r
u
n-command:
p
ret
t
ify -D_FORTIFY_S
O
URCE
workarou
n
d
"
commit
|
commitdiff
|
tree
2011-04-14
Junio C
Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
R
e
né Scharfe
archive
:
d
o
c
ument limit
a
tion
o
f t
a
r
.
u
m
ask confi
g
se
t
ting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Micha
e
l J Grube
r
t3306,
t
5304:
a
void clock skew issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Micha
e
l J
G
ruber
git
.
t
xt: fix lis
t
continu
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Juni
o
C
Hama
n
o
Git 1
.
7
.
5-rc2
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
J
u
nio C H
a
mano
Merge bra
n
ch
'
jc/rev-li
s
t-op
t
ions-f
i
x'
i
nto maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ham
a
no
Merge
b
r
an
c
h
'
js
/
c
he
c
kout-u
n
t
r
acked
-
sy
m
link' into maint
commit
|
commitdiff
|
tree
2011-04-13
J
im
M
eyering
remove
d
oub
l
ed words,
e
.
g
.
, s/to to/
t
o/, and fix rel
a
ted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar Ramachan
d
r
a
rever
t
: Hide '-r' o
p
tion in de
f
ault usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--
d
irstat: In case of r
e
names, use target filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Ju
n
i
o C Hamano
M
e
r
g
e
branch 'js/checkout-u
n
t
r
acke
d
-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Junio C
H
amano
Merge branch 'nd/in
i
t-
g
itdir'
commit
|
commitdiff
|
tree
2011-04-12
Johannes
S
ixt
t2021: mark a test as fixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
anne
s
Sixt
t0001: guard a new
test with
S
Y
M
LINKS pr
e
re
q
uisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
T
e
ac
h
--
d
irstat not to co
m
ple
t
ely ignore rearranged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Æ
var Arnfj
ö
rð Bjarmaso
n
Makefile:
e
xtrac
t
Q
_
() sou
r
ce s
t
rings as nget
t
ext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ram
s
ay
J
ones
i18n: avo
i
d par
e
n
t
h
e
sized string as a
r
ra
y
initializer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erl
a
nd
-
-dirstat-by-file: Make it faster and more cor
r
ect
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herlan
d
--d
i
rstat: Describe non-
o
b
v
ious diff
e
rences re
l
ative
.
.
.
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
n
i
o
C Hamano
Merge
g
it://git
.
b
o
go
m
ips
.
org/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C Haman
o
Me
r
ge git:
/
/g
i
t
.
kernel
.
org/pub/scm
/
gitk/gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan Mc
G
ee
s
tash: ensure
-
-no-
k
e
ep-index and --pat
c
h
can be used
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
sta
s
h:
add two
m
ore t
e
sts
fo
r
--no-kee
p
-index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Andrew
Garber
gi
t
-p4:
r
eplace each
t
ab w
i
th 8
s
paces for consistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff K
i
ng
upload-p
a
ck: start p
a
ck-
o
bjec
t
s
b
efore async re
v
-
l
ist
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Git 1
.
7
.
5-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ham
a
n
o
S
y
nc wi
t
h 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
J
unio C Hama
n
o
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
amano
M
e
rge branch '
n
m/m
a
int-conflicted-s
u
b
module-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
J
unio C
Hamano
M
erge branch 'mg/r
e
v-
l
ist-n-reverse-doc
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Hamano
Merge branch
'jk/maint-remote-mirror-
s
afer'
commit
|
commitdiff
|
tree
2011-04-06
J
u
n
io C
Hamano
Merge branch 'm
g
/doc-r
e
visions-
t
xt'
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: dr
o
p dirty worktree c
h
eck o
n
ap
p
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
uni
o
C
H
am
a
no
Te
a
ch c
o
re
.
b
i
gfile
t
hreashold to
pack-obj
e
c
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jon
Seymour
stash: f
i
x fa
l
s
e
p
o
s
i
tive in the
i
nvalid ref
t
e
s
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
eff King
sta
s
h: fix ac
c
idental apply of non
-
existe
n
t stashes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Michael J
Gru
b
e
r
revision
s
.
txt: language improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
J
unio
C
Ha
m
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-04
Juni
o
C Hamano
Merge bran
c
h 'jl/submodul
e
-f
e
t
c
h-on-demand'
commit
|
commitdiff
|
tree
2011-04-04
J
unio C
H
a
mano
Me
r
ge
b
ranch 'jc/
r
e
v
-
list-options
-
fix'
commit
|
commitdiff
|
tree
2011-04-04
SZEDER Gábor
Docu
m
enta
t
ion:
t
ri
v
ial grammar fix in core
.
worktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Jakub Nar
e
b
s
ki
gitweb: Fix parsing of
negative
fract
i
on
a
l
ti
m
ezones
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
J
unio C H
a
mano
Me
r
ge branch 'nm/maint-
c
o
n
flicted
-
s
ubmodule-e
n
tries'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge
b
ra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Start prepar
i
ng for
1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next