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 'cj/p4merge' into maint
2011-05-13
Jun
i
o C Hama
n
o
Merge b
r
anch 'c
j
/p4merg
e
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge
b
r
anch
'jk/merge-
o
ne-file-wo
r
kin
g
-tree' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Merge b
r
an
c
h
'jc/
f
ix
-
diff-file
s
-unmerged
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
M
e
rge branch 'm
z
/maint-ren
a
me-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
o
han H
e
r
land
t5400: Fix a couple
o
f
t
y
pos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
oão Britto
R
emove du
p
licated "is
a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C
H
amano
t3
7
01:
f
ix here do
c
ument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Michael
J Gruber
git-f
a
st-imp
o
rt
.
t
xt
:
--
r
elative-marks take
s
no paramete
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
she
l
l: add mis
s
ing initialization
o
f a
r
gv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
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
H
a
mano
Mer
g
e bran
c
h 'jh/dir
s
tat' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge branch '
s
p/maint
-
clear-p
o
stfiel
d
s' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Ha
m
ano
Merge b
r
a
n
c
h
'
jk/main
t
-st
a
sh-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge branch 'jk/mai
n
t-upload-pa
c
k-shal
l
o
w
' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Ha
m
a
no
Me
r
ge branch 'd
m
/st
a
sh-k-i-p'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge branch 'jc/pa
c
k-objec
t
s-bigf
i
le' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o
C
H
am
a
no
M
e
rge branch 'mg/reflog
-
wit
h
-options' int
o
main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge branch 'jk/stash-lo
o
sen-safety' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
Hamano
Me
r
ge branc
h
'ar/clean-rmdir-empty' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
H
ama
n
o
M
e
rg
e
b
r
anch 'm
g
/
sha1-path-adv
i
se
'
i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Valentin
H
aene
l
git-
a
d
d
.
txt: docume
n
t 'add
.
igno
r
eE
r
rors'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran
J
e
ssup
Pas
s
empty
f
ile to p4merge where
n
o base is
s
uitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
me
r
ge-one-file: fix
b
ro
k
e
n merges with
alternate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
ad
d
tests
f
o
r
m
erge-index
/
merge-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Star
t
1
.
7
.
5
.
1
m
aint
e
na
n
ce track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
ano
Me
r
ge bra
n
ch 'mg/
x
-y
e
ars-12-mont
h
s' into maint
commit
|
commitdiff
|
tree
2011-04-29
S
y
lvai
n
Rabot
g
it
-
send-email: fix
missi
n
g space
i
n error mess
a
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio C Ha
m
ano
ht
t
p: clear POSTFIELDS when in
i
tia
l
izing
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-fi
l
es: show un
m
erged en
t
ries corre
c
tly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Haman
o
d
i
ff: r
e
move often un
u
sed parameter
s
f
r
o
m diff_
u
nmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ha
m
ano
dif
f
.
c:
r
et
u
rn filepair f
r
om diff_unmerg
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Hamano
test: us
e
$_z40 from t
e
st-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
M
i
ch
a
el
J
Gruber
date:
avoid "X yea
r
s,
1
2 months"
in r
e
lative dates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io C H
a
mano
Gi
t
1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Ha
m
ano
Sync
with
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C
Hamano
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
M
i
ch
a
el
J
Gruber
gi
t
-sv
n
.
txt
:
Document --mergei
n
fo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Junio C H
a
mano
Reve
r
t "run-command:
prettify -D_FORTIFY
_
S
OURCE workar
o
und"
commit
|
commitdiff
|
tree
2011-04-14
J
unio C Haman
o
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2011-04-14
René Scharf
e
a
r
chiv
e
: do
c
ument limitatio
n
of tar
.
um
a
sk
c
onfig sett
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael
J Grube
r
t3306,
t
5304: avoid
c
l
ock skew issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
g
it
.
txt: f
i
x
l
ist continuation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
G
it 1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hama
n
o
M
e
rg
e
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-04-13
J
u
nio C Hama
n
o
Merge branch
'jc
/
rev-list-options-fix' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-04-13
J
u
nio C
H
amano
Me
r
ge branch 'js/checko
u
t-untracked
-
symlink' into maint
commit
|
commitdiff
|
tree
2011-04-13
J
i
m
Meyerin
g
re
m
ove doubled
words
,
e
.
g
.
,
s
/to t
o
/to/, an
d
fix rel
a
ted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar Ramacha
n
dra
revert: H
i
de '-r'
option in defa
u
lt
usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Her
l
and
--dirstat: In case of renames
,
use target filename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Junio
C Hamano
Mer
g
e bran
c
h 'js/chec
k
ou
t
-untrac
k
ed-syml
i
nk'
commit
|
commitdiff
|
tree
2011-04-12
Jun
i
o C
Hama
n
o
Merge branch 'nd/init-gitdir'
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
nnes Sixt
t2021: mark a te
s
t as fixe
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
nnes Si
x
t
t0001: guard a new test with SYMLINKS prerequisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --
d
irstat not t
o
compl
e
tely ignor
e
rearranged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ævar Ar
n
fjörð Bjarmaso
n
Ma
k
e
f
ile: ext
r
act
Q
_() source strings as ng
e
t
t
ex
t
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
R
amsay
Jones
i18n: av
o
id parenthesized stri
n
g
a
s
a
rray initializer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
h
an Herland
--dirs
t
a
t
-by-fi
l
e: Make it
f
as
t
e
r and more
corr
e
ct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
e
r
lan
d
-
-
d
i
rstat: Des
c
ribe
non-obvious differences relativ
e
.
.
.
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
M
e
rge git:
/
/g
i
t
.
bogo
m
ips
.
org
/
g
i
t-svn
commit
|
commitdiff
|
tree
2011-04-11
J
u
nio C Ha
m
ano
M
e
r
g
e gi
t
://git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan Mc
G
ee
stash
:
ensure
-
-no-k
e
e
p
-index and --p
a
t
c
h can be us
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Da
n
McG
e
e
stash: add two more tes
t
s for --no-keep-i
n
de
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Andrew G
a
r
b
er
git-p4: replace
each tab with 8 spaces for consistency
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
uplo
a
d-pack:
s
t
a
r
t
pack-objects before
a
sync r
e
v
-
list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
H
a
mano
Git 1
.
7
.
5
-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Sync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio 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
amano
Merge
branch 'nm/mai
n
t-conflicted-submodule-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Hamano
Me
r
ge bran
c
h 'mg/rev-list-n-re
v
ers
e
-doc' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-04-06
Junio C
H
aman
o
Merge bran
c
h
'jk/
m
a
int-remote-mirror-safer'
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
Ha
m
a
n
o
Me
r
ge bran
c
h 'mg/doc-revision
s
-txt
'
commit
|
commitdiff
|
tree
2011-04-06
Jeff
King
stash
:
drop dirty worktree check
o
n apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
uni
o
C
Ham
a
no
Te
a
ch core
.
big
f
i
lethreashold
t
o
pac
k
-
o
bjects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jon
S
eymour
st
a
sh: f
i
x fal
s
e positive in th
e
invali
d
ref test
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
eff
Kin
g
stash
:
fix accidental
a
pp
l
y
of
n
on-exi
s
te
n
t
stashes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Michael J Gruber
r
evisions
.
txt: language
improvements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2011-04-04
Junio C
H
a
mano
Merge branch '
j
l/su
b
module-fetch-on-demand'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hama
n
o
Merge
branch 'jc/rev
-
list-o
p
tions-fix
'
commit
|
commitdiff
|
tree
2011-04-04
SZEDE
R
Gábor
Do
c
u
m
entation: t
r
ivial gr
a
mmar
f
ix in core
.
wo
r
ktree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
J
akub
Na
r
e
bsk
i
gitweb:
F
ix pa
r
sing of ne
g
a
t
ive fract
i
onal
t
imezones
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
M
e
rge
br
a
n
c
h '
n
m/maint-conflict
e
d-submodule-ent
r
ie
s
'
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
io C Hama
n
o
Start prepari
n
g for 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Jeff King
p
u
ll: do not clobber u
n
trac
k
ed files
on
i
nitial pull
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
J
unio
C
Hamano
Mer
g
e bran
c
h 'jc/i
n
dex-update-if-able'
i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch
'
l
t
/default-abbrev' i
n
to maint
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
Hamano
Merge b
r
anch 'j
c
/
maint-rev-list-culled-boundary
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch 'mm/ma
i
nt-log-n-with-diff-filtering' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
unio C Hamano
M
er
g
e
branch 'jk/format-patch-multiline-
h
eader'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
io C Ha
m
ano
Merge branch
'
jn/maint-instaweb-plack-fix' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge bran
c
h
'
l
p/
c
onfig-vername-check' int
o
maint
commit
|
commitdiff
|
tree
2011-04-03
M
icha
e
l J
G
ruber
s
h
a1_name: Suggest
commit:
.
/file for path in subdi
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
M
i
chael J Gruber
t1506: factor out te
s
t f
o
r "Did you mean
.
.
.
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Jonat
h
an Nie
d
er
compat: add m
i
ssing #
i
n
c
lude
<
sys/resource
.
h>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Lawr
e
nce Mi
t
chell
git
.
e
l
: Don't us
e
font-lock-compile-keywords
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Æ
var Arnfjör
ð
B
j
armason
t2
0
19-checkout-ambiguo
u
s-ref
.
sh: depend on C_LOCALE_OUTPUT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Dan McGee
Fix two unused
v
ariable
wa
r
nings in gcc 4
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Dan McGee
Remove o
l
d binaries fro
m
.
gitignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next