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 'cn/format-patch-quiet' into maint
2011-05-15
Junio C
H
a
m
ano
Me
r
ge branch 'cn/format-patch-quiet' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Merge b
r
anch 'jm/mergetool-submodules'
i
nt
o
m
ain
t
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Ha
m
a
n
o
Mer
g
e branch 'jk/format-
p
atch-
q
uote-special-in-fro
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Ham
a
no
Merge branch
'
v
h
/git-svn-
d
oc
'
into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Ham
a
no
git_open_noatime(): drop unuse
d
parame
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
sha1_file:
typof
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
add, merge, diff: do n
o
t use strcasec
m
p to co
m
p
are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
ama
n
o
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Ha
m
ano
Merge br
a
n
c
h
'
a
w/maint-reb
a
se
-
i-p-no-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merg
e
bran
c
h 'js/blame-
p
ar
s
ename
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'gr/cvsimport-
a
lternative-cvspass
-
loca
t
ion
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Me
r
ge bran
c
h 'cj
/
p4merge' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge
branch 'jk/
m
er
g
e-one-file-work
i
ng-tre
e
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merge bran
c
h
'
jc/fix-diff-files-
u
n
m
erged' i
n
to ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merge branch '
m
z/mai
n
t-ren
a
m
e-
u
nmerge
d
' into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herla
n
d
t
5
400: Fi
x
a couple
of typo
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João
Britt
o
Remove duplica
t
ed "is a
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Ju
n
io
C Hamano
t3
7
01: fix
here
d
oc
u
me
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gr
u
ber
gi
t
-fast-import
.
t
x
t:
-
-relative-marks takes no parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dim
a
Sharov
sh
e
ll: add missing in
i
t
i
alization of argv
0
_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernha
r
dt
t/annotate
-
tests: Use echo
&
c
at
i
n
s
tead of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
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
M
e
rge branch 'j
h
/dirstat' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge branc
h
's
p
/maint-clear-postfiel
d
s' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jk/maint
-
stash-oob
'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
M
e
rge branch 'jk/m
a
int-upload-pack-shallow
'
in
t
o main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge bran
c
h 'dm/stash
-
k-i-p' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
a
n
o
Merg
e
branch 'jc/pa
c
k-objects-bi
g
file' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'mg/reflog-
w
ith-
o
ptions' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge branch 'jk/stash-loosen-safety' in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge
b
r
an
c
h 'ar/clean
-
r
m
dir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
ranch 'mg/sha1
-
pat
h
-advise' into maint
commit
|
commitdiff
|
tree
2011-05-04
V
a
lentin
H
aenel
git-add
.
txt: document '
a
dd
.
ig
n
oreErrors'
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
P
ass empty file to p
4
merge where n
o
base is suitab
l
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
G
u
y Rouillier
Look
for passwo
r
d in both CVS a
n
d CVSNT pass
w
o
r
d file
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
me
r
ge-one-f
i
l
e: fix
b
r
oken merges wi
t
h alternate work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add te
s
t
s
f
o
r
merge-index / me
r
ge-
o
n
e-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hama
n
o
Start 1
.
7
.
5
.
1 maint
e
nance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
M
erge branch 'mg/x-years
-
12-months'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-04-29
S
ylvain
Rabot
git
-
send
-
email: fix missing space
in error me
s
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh St
o
ne
blame: tolerate
bogus
e
-
mail
addre
s
ses
a b
i
t bet
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wong
git-
r
ebase--
i
nterac
t
i
v
e
.
sh: preserve-merg
e
s fails on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
prett
y
: quote rfc
8
22 special
s
in email addresses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
ntin Haenel
gi
t
-svn
.
txt: small t
y
peface improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
ntin Haene
l
git-svn
.
tx
t
: move opti
o
n
d
escr
i
ptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Hae
n
el
git-s
v
n
.
txt: fix
u
sage of
--add-author-from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jun
i
o C
H
a
mano
h
t
tp: clear POSTFIE
L
DS when
i
nitia
l
izing a
slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Git
1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Ha
m
a
n
o
diff-files: s
h
ow unmer
g
ed entri
e
s correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff: remove
o
ften unused p
a
rameters f
r
om diff_unmerge(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
n
o
diff
.
c
: return f
i
lepair fro
m
diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio
C Hamano
test
:
use $
_
z40
f
rom test-l
i
b
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Gruber
da
t
e: avoid "X years
,
12
month
s
" in relative d
a
tes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
H
amano
Git 1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
J
u
nio C Hamano
Sync with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io C Hamano
G
it 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
.
t
x
t: Documen
t
--mergeinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Ju
n
io C
Ham
a
n
o
Re
v
ert
"run-command: pret
t
ify -D_
F
ORTIFY_SOURCE w
o
rkaround"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
Merge branch '
m
a
int'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
archive: document li
m
it
a
t
i
on
of
tar
.
umask confi
g
s
ett
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J
Gruber
t
33
0
6
,
t5304
:
a
v
oid clock sk
e
w issue
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Micha
e
l
J
G
r
u
ber
git
.
txt: fix l
i
st co
n
tinu
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ham
a
no
Git 1
.
7
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
H
amano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C H
a
mano
M
er
g
e
branc
h
'
j
c
/rev-li
s
t-options-fix'
i
n
to maint
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
io C Hamano
Merge b
r
anch 'js/c
h
eckout-
u
ntrack
e
d-sy
m
l
i
n
k
' into
m
a
int
commit
|
commitdiff
|
tree
2011-04-13
Jonat
h
o
n
Mah
m
ergetool:
T
each about submodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Jim M
e
y
ering
r
emove doubl
e
d wor
d
s, e
.
g
.
, s/to
t
o/to/, and fix relat
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar Ramachandra
re
v
e
r
t:
Hide '
-
r' option in
d
e
fault usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Martín
Nieto
f
ormat-patch:
doc
u
ment
--quie
t
opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Martí
n
Nieto
format-patch
:
don't pass on the --qu
i
et flag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
J
o
han Herland
-
-dirstat: In case of r
e
n
a
mes,
use t
a
r
g
e
t filena
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Junio
C Hamano
Merge branc
h
'
j
s/checkou
t
-un
t
racke
d
-symli
n
k'
commit
|
commitdiff
|
tree
2011-04-12
Jun
i
o
C
Hamano
Merge branch 'nd/ini
t
-gitdir'
commit
|
commitdiff
|
tree
2011-04-12
Johannes Sixt
t2
0
2
1:
m
ark a test as fixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johannes
S
ixt
t0001: guard a new t
e
st with SYM
L
INKS prerequisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Te
a
ch
-
-dirstat not to completely ign
o
re rearranged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ævar Arnfjörð
B
j
arm
a
son
Make
f
ile:
extract Q_() source s
t
ri
n
g
s a
s
n
ge
t
t
e
x
t()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay
J
ones
i
1
8n:
avoid
parenthesized
st
r
ing
as array
i
niti
a
l
i
z
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herland
--dirstat-by-fil
e
:
Make i
t
faster and more c
o
rrect
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: Describe non-obvious differences
r
elat
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
J
u
nio C Hamano
Merge
g
i
t:
/
/
g
it
.
b
og
o
m
i
ps
.
org/git
-
svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hamano
Merge g
i
t://git
.
ke
r
nel
.
org/pub/s
c
m/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan M
c
Gee
sta
s
h: en
s
ure --no-keep-index an
d
-
-
p
a
tch
c
an
b
e
used
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
stash: add two more tests for --no-
k
e
ep-inde
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Andrew G
a
rber
g
i
t
-
p4: replace eac
h
tab with 8 spa
c
es
f
o
r
consisten
c
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
u
p
load-pack: sta
r
t pack-objects before async re
v
-
l
ist
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
unio C Ha
m
ano
Git
1
.
7
.
5
-
rc
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio C Hamano
Sync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Gi
t
1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o
C Hamano
Merge branch 'nm/maint-confl
i
c
t
ed
-
submodule-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
Hamano
Merge branch 'mg/
r
ev-l
i
st
-
n
-
r
e
verse-doc' int
o
maint
commit
|
commitdiff
|
tree
2011-04-06
J
u
ni
o
C Hamano
Merge branch 'jk
/
maint-
r
emote-mirror-safer'
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Ha
m
ano
Merge branch 'mg/doc-revisions-txt'
commit
|
commitdiff
|
tree
2011-04-06
J
eff King
s
tash
:
drop dirty worktree che
c
k
o
n
a
pply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
Hamano
Teach
core
.
b
i
gfilethreashold to pack-objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
on Se
y
mo
u
r
stash: fix false positive in the invalid ref test
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jef
f
Ki
n
g
stas
h
: fix accidental apply
of
n
on-existent st
a
shes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
M
i
chael J
Grub
e
r
revisions
.
t
x
t: langu
a
ge i
m
prove
m
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
next