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
ll-merge: warn about inability to merge binary files only when we can't
2012-09-12
J
uni
o
C
Hamano
ll-merge: wa
r
n about inability to merge binary files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
J
unio C Hamano
attr: "binary"
a
t
t
ribu
t
e
shoul
d
c
h
o
ose built-i
n
"binary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
J
u
nio
C Hamano
merge: teach -
X
ours/-Xt
h
eirs to
b
inary ll-merge driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
J
uni
o
C Hamano
Git 1
.
7
.
9
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o
C Hama
n
o
Sync wi
t
h
1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C
H
a
m
a
no
Gi
t
1
.
7
.
8
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Hamano
S
y
n
c with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Hama
n
o
Git 1
.
7
.
7
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Jona
t
h
an Nieder
bu
n
dle: remove stray single-quote from
error messa
g
e
Reported-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-10
Junio
C
Ham
a
n
o
Merge branch 'maint-1
.
7
.
8
'
into mai
n
t
-
1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C H
a
m
ano
M
e
rge branch
'jc/maint-verify
-
objects-remov
e
-pessimi
s
m
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
M
erge
branch
'
dw/gitweb-do
c
-grammo' into m
a
int-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C
H
a
mano
Merg
e
branch 'tr/cache-tree' i
n
to ma
i
n
t-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch
'cb/maint-t
5
54
1
-make-server-port-portable
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Hama
n
o
Merge branch 'cn/mai
n
t
-
rev-list
-
doc'
i
n
t
o main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C H
a
mano
Merge branch 'tr/maint-
b
und
l
e-bou
n
d
a
ry
'
i
n
to
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
u
ni
o
C
Hamano
Mer
g
e
bra
n
c
h
't
r
/maint-bundle-l
o
ng
-
sub
j
ec
t
'
into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ham
a
no
M
e
rge bran
c
h 'ph/rerere-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
J
unio C Hamano
Git 1
.
7
.
9
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hama
n
o
Merge branch 'jc/mai
n
t-m
e
rg
e
-autoedit' i
n
to maint
commit
|
commitdiff
|
tree
2012-03-30
Heiko Voigt
string
-
l
i
st:
document
that string_l
i
st_insert() inse
r
ts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
J
u
n
i
o
C
H
amano
Git 1
.
7
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Me
r
ge branch 'j
n
/maint-
f
as
t
-impor
t
-empty-ls' into maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C Ham
a
no
M
erge
bra
n
ch 'ph/re
r
ere-doc' into maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C Haman
o
Merge bran
c
h 'ms/maint-config-error-at-eol-linecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mark Lodato
gr
e
p doc: add
-
-break / --heading /
-W to
s
ynop
s
is
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Rodrigo Silva (Mestr
.
.
.
Documentation: improve description of GIT_EDITOR
a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Nel
s
on Benite
z
Leon
do
c
umentat
i
on: fix
a
l
phabetic ordered list for git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-23
D Waitzman
Docum
e
nta
t
ion/gitweb
:
trivial English fixes
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
M
erg
e
bran
c
h
'maint-1
.
7
.
8' into
maint
commit
|
commitdiff
|
tree
2012-03-20
Junio
C
H
a
mano
merge
:
backp
o
rt
GIT
_
ME
R
GE
_
AUTOED
I
T
s
u
p
po
r
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-20
Junio C H
a
mano
M
e
rge
b
ranch 'ks/sor
t
-
w
ild
c
a
rd-in-makefile' into
m
a
int
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Haman
o
M
erge
b
ranch 'jc/
a
d
vise-i18
n
' i
n
to
m
aint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Jun
i
o C
H
aman
o
M
e
rge branch 'jn/gitweb
-
u
n
specified
-
ac
t
i
on' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Junio C
H
amano
fetch/receiv
e
:
r
e
move over-p
e
ss
i
mistic connectivi
t
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Git 1
.
7
.
9
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Juni
o
C Hamano
Merg
e
br
a
nch
'
t
r
/maint-bundle-boundary' in
t
o maint
commit
|
commitdiff
|
tree
2012-03-12
J
unio C Hamano
Merg
e
bra
n
ch 'jc/maint-diff-pa
t
ch-h
e
ader' into maint
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge bran
c
h 'jn/maint-do-not-ma
t
ch
-
with-unsanitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge branch
'jc/a
m
-3-no
n
st
a
nd
a
rd-popt' into maint
commit
|
commitdiff
|
tree
2012-03-12
M
a
r
tin Stenb
e
r
g
c
o
n
fig: repo
r
t
e
r
r
ors at the EOL wi
t
h
c
orrect line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-08
Phil H
o
rd
r
e
rere: Document
'r
e
rere r
e
maining'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-06
Jakub N
a
rebski
gitwe
b
:
F
ix f
i
xed st
r
ing (non-regex
p
) project search
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-06
Thomas Rast
t
5704: fix non
p
ortable
sed/grep
u
sages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-06
Junio C H
a
m
ano
Merge bran
c
h 'ma
i
nt-1
.
7
.
8' into main
t
commit
|
commitdiff
|
tree
2012-03-06
Junio C Hamano
Mer
g
e bra
n
c
h
'
m
a
int-1
.
7
.
7'
i
nto maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-06
Tho
m
as Rast
Do
c
umen
t
th
e
-
-
hi
s
togra
m
d
iff optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Git 1
.
7
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Juni
o
C
Hamano
Merge branc
h
'jc/doc-merge-o
p
tions'
in
t
o maint
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio C Ham
a
n
o
Merge b
r
anch 'cn/maint-rev-list-doc' int
o
mai
n
t
commit
|
commitdiff
|
tree
2012-03-05
Thom
a
s Rast
fast-import
:
z
e
ro all of 'struct tag
'
t
o s
i
lence valgr
i
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io
C H
a
mano
U
pda
t
e dra
f
t release notes t
o
1
.
7
.
9
.
3 for the last
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
J
unio C Ham
a
n
o
Merge branc
h
'cn/maint
-
branch-with-bad' into
m
aint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Haman
o
Merge branch '
j
n/maint-gitweb-inv
a
l
i
d
-
re
g
exp'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
i
o
C
Ham
a
no
M
erge branch
'
nd
/
maint-verify-objects' into maint
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o C
H
am
a
no
Merge branch 'jk/maint-a
v
oid-streaming-f
i
ltered
-
content
s
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio C
Ham
a
no
Mer
g
e branch 'jb/filter-ign
o
re-sigp
i
pe' i
n
to maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Ha
m
ano
M
e
rg
e
branch 'sp
/
s
m
art-http-failure-to-p
u
sh' into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io C
Haman
o
Merge branch '
t
r/mai
n
t-bundl
e
-long-sub
j
ect'
i
nto maint
commit
|
commitdiff
|
tree
2012-03-05
C
lemens Buchacher
http
.
p
r
oxy: als
o
mention https
_
pr
o
xy and a
l
l_pr
o
xy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-03
Michael J Gruber
t0300:
w
o
rk ar
o
und bug in
dash 0
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-03
Tom Grenna
n
t
5
5
1
2
(ls
-
remote): mode
r
n
iz
e
s
t
y
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-02
Ste
f
ano Lattarini
te
s
ts:
fix
s
purious error when run directly with Solari
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-02
Junio C Hamano
Do
c
umentat
i
on: do not assume that n > 1
i
n <rev>~$n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Thomas Rast
bundle: k
e
ep around names p
a
ssed
t
o
add_pen
d
ing_
o
bj
e
ct()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
T
h
o
m
a
s
Ras
t
t5510:
ensure we sta
y
in the toplevel tes
t
dir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Thomas Rast
t5
5
10: r
e
f
a
cto
r
bun
d
le->pack conversion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Junio C
H
ama
n
o
diff -p: squ
e
lch "dif
f
--git
"
header
f
or st
a
t-dir
t
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hama
n
o
t401
1
: i
l
l
u
strate "diff-ind
e
x -
p
"
o
n
stat
-
dirt
y
paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Ju
n
io C
H
amano
t4011:
m
odernise style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Lib
o
r Pecha
c
ek
D
o
cumentation fixes in git-config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
Carlos
M
ar
t
ín Nieto
D
o
cumentation: use {asterisk} in
rev-list-
o
ptions
.
txt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
Jakub Na
r
e
bski
gitweb
:
H
an
d
l
e
i
n
v
al
i
d regexp in regexp se
a
r
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
Ng
u
yễn
T
hái Ngọc Duy
r
e
v-lis
t
: fix --verify
-
objects --q
u
i
e
t becoming --o
b
jects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
N
g
uyễn
T
hái Ngọc
Duy
rev-lis
t
:
re
m
o
ve BISECT_SHOW_TRIED f
l
ag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C H
a
m
a
no
Update dr
a
ft release notes to 1
.
7
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge b
r
a
n
c
h
'
pj/r
e
mote-set-branches-us
a
g
e-fix' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Junio
C Ham
a
no
Merge bra
n
c
h
'
j
n/
g
itweb-
u
nb
o
rn-head' into m
a
i
nt
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C H
a
mano
Merge
branch 'jn/ancient
-
m
el
d
-
s
upport' into maint
commit
|
commitdiff
|
tree
2012-02-27
J
u
n
io C Hamano
Merg
e
b
r
anc
h
'tr/me
r
ge-edit-guidan
c
e' into maint
commit
|
commitdiff
|
tree
2012-02-27
Tim Heniga
n
C
o
d
i
ngGuidelines
:
do n
o
t use 'which'
i
n sh
e
ll scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Ti
m
Henigan
CodingGuideli
n
es:
A
d
d
a note about spaces after redirect
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Ca
r
los Martín Nieto
branch
:
don'
t
assume the merge fi
l
ter ref exists
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Mi
c
hael H
a
ggerty
post-r
e
ceive-email: match
u
p
$
L
OGBEGIN
.
.
$LO
G
END p
a
irs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Mi
c
hael Haggerty
post-receive-email:
rem
o
ve unu
s
ed
v
ari
a
ble
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
J
u
n
i
o
C
H
a
mano
te
s
t: "am -3"
ca
n
accept no
n
-stan
d
ard -p<num>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio
C
Hamano
Document accumulated fixes si
n
c
e
1
.
7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C
H
amano
Merge branch 'jc/
a
d
d
-refre
s
h-unme
r
ged
'
into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio
C
Hamano
M
erge br
a
nch 'js/config
u
r
e-
l
ibintl' into maint
commit
|
commitdiff
|
tree
2012-02-27
J
u
ni
o
C
H
a
m
a
n
o
Sync with 1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Git 1
.
7
.
8
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Michał K
i
ed
r
ow
i
cz
grep -P: Fi
x
matc
h
ing ^
an
d
$
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Jim Meyering
am: d
o
n't
infloop
fo
r
an empty input file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Andre
w
Wo
n
g
rebase
-m:
only call "notes
c
opy" w
h
en rewritten exists
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
P
e
te Wyckoff
g
it-p4: re
m
ov
e
bash-
i
s
m
i
n t9800
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyckoff
git-p4: remov
e
bash-ism in t9809
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyck
o
ff
g
i
t-p4
:
fix submit regression with clie
n
tSpec and subdir
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pe
t
e Wy
c
koff
git-p4: set useClientSpec va
r
iabl
e
on init
i
al clo
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-26
Dmitry V
.
Levin
M
a
kefile: a
d
d thread-utils
.
h to
LIB_H
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-24
Jef
f
K
i
n
g
do not s
t
r
e
a
m l
a
rge
files to pack wh
e
n fi
l
t
e
rs are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next