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
ll-merge: warn about inability to merge binary files only when we can't
2012-09-12
J
u
nio
C H
a
mano
ll-merg
e
: w
a
rn about inabili
t
y
t
o
m
erge bi
n
ary files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-09
J
unio C
H
a
ma
n
o
attr: "binary" a
t
tribute sho
u
ld cho
o
se built-in "binar
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-09
Ju
n
io C Hamano
merge: tea
c
h
-Xours
/
-Xtheirs to
bina
r
y ll-merge dri
v
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
amano
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Hamano
S
ync wit
h
1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Gi
t
1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C Hamano
Sync with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ham
a
no
Git 1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jonathan Nieder
bundle: rem
o
ve s
t
ray single-quote fro
m
error message
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
Haman
o
Merge branch
'
maint-1
.
7
.
8' i
n
to maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C H
a
m
ano
Merge br
a
nc
h
'jc/
m
aint
-
verify-o
b
je
c
ts-r
e
move-pessimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio
C Hamano
M
erge branch 'd
w
/gitweb-doc-gr
a
m
mo' int
o
m
ai
n
t-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Hamano
Me
r
ge bran
c
h 'tr
/
ca
c
he-tre
e
'
in
t
o main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio
C Hamano
Me
r
g
e
b
r
anch 'cb/main
t
-t5541-make-se
r
ver-port
-
port
a
b
le
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
uni
o
C
Hamano
M
erg
e
branch
'
cn/m
a
int-rev-list-d
o
c' into maint-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Haman
o
Merge
b
ranch 'tr/maint-bund
l
e
-b
o
u
ndary' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio C Hamano
Merge
branch 'tr/
m
aint-bundle-lo
n
g-
s
ubj
e
c
t
' int
o
ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C H
a
mano
Merge branc
h
'
p
h/rer
e
r
e-
d
oc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hama
n
o
Git 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Jun
i
o C
Hamano
Merg
e
branch 'jc/maint-m
e
rge-autoedit
'
into mai
n
t
commit
|
commitdiff
|
tree
2012-03-30
H
eiko Voigt
str
i
ng-list: d
o
c
u
ment th
a
t string
_
lis
t
_insert() i
n
ser
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Git 1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Jun
i
o
C Hamano
Merge branch 'jn/ma
i
nt-fas
t
-impo
r
t-empty-ls' into maint
commit
|
commitdiff
|
tree
2012-03-26
Junio
C Hamano
Merg
e
branch 'ph/rerere
-
doc' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2012-03-26
Junio C
H
am
a
no
Merg
e
branch 'm
s
/
maint
-
config-error-at-eol
-
linecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mark Lodato
grep doc: add --break
/
--heading / -W to synopsis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Rodrigo
S
i
l
va
(
Me
s
tr
.
.
.
Documen
t
ation: im
p
rove descriptio
n
of GIT_EDITOR and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Nelson Benitez L
e
on
documentation: f
i
x alphab
e
t
ic order
e
d list for git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
D
Waitzman
Documentation/gitweb:
trivial Engl
i
sh fixes
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
M
e
rge b
r
anch 'mai
n
t-1
.
7
.
8' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-03-20
Junio C
Haman
o
me
r
ge:
b
a
c
kpo
r
t GIT_MERG
E
_AUT
O
EDIT
s
u
p
p
ort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
J
u
n
i
o
C Hamano
Mer
g
e branch 'k
s
/
s
ort-wildcard-in-m
a
kef
i
le' into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Ham
a
no
Merge branch
'jc
/
ad
v
ise-i18n' in
t
o maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio C H
a
mano
Merge
bran
c
h
'jn
/
git
w
eb-
u
nspecifie
d
-
a
ction' i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Junio C H
a
mano
f
etch/
r
e
ce
i
ve:
r
emove over-pessimistic c
o
nnectiv
i
t
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
G
i
t
1
.
7
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio
C Hama
n
o
M
e
rge bran
c
h 'tr/ma
i
n
t
-
b
undle-b
o
und
a
ry
'
i
nto
m
aint
commit
|
commitdiff
|
tree
2012-03-12
J
u
n
io C
Ha
m
ano
M
e
r
g
e branc
h
'
jc/maint-
d
if
f
-patch-header' into
m
aint
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Junio
C
Hamano
Merge branch 'jn/maint-do-not-ma
t
ch-
w
ith-un
s
anitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio C
Hamano
Me
r
ge branch 'jc/am-3
-
nonstandard-pop
t
' into maint
commit
|
commitdiff
|
tree
2012-03-12
Mar
t
in Stenberg
config: report er
r
o
r
s at the EOL
w
ith
correc
t
line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil Hord
rerere: Docu
m
e
n
t 're
r
ere remaining'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Jakub Nar
e
b
s
k
i
g
itweb:
Fix fixed string (
n
o
n
-reg
e
xp) project search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Thomas Rast
t5704: fix nonportable sed/g
r
ep us
a
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Junio C Hamano
M
erge branch 'maint-
1
.
7
.
8
' in
t
o m
a
int
commit
|
commitdiff
|
tree
2012-03-06
Junio
C
H
amano
Me
r
ge branch
'
m
a
int-1
.
7
.
7'
i
nt
o
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-06
T
homa
s
Rast
Do
c
u
m
ent the --histogr
a
m diff option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio
C
H
amano
Git 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
H
amano
Me
r
ge b
r
a
n
ch 'jc/doc-me
r
ge-options' into ma
i
nt
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge bran
c
h
'
cn/maint-rev-l
i
st-
d
oc' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-03-05
Thomas Rast
f
ast-impo
r
t: zero all o
f
'struct
t
ag' to silence valgri
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Up
d
at
e
draf
t
release notes to 1
.
7
.
9
.
3
f
or the last
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
J
unio C Hamano
Me
r
ge branch 'cn/maint-bra
n
ch-with-bad' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Mer
g
e branch 'jn/maint
-
g
i
tweb-invalid-regexp' into
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io
C
Ham
a
no
M
e
rge branch 'nd/maint-veri
f
y-o
b
jects
'
in
t
o maint
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio
C Haman
o
M
e
rge branch 'jk/maint-avoid-streami
n
g-
f
iltered-conten
t
s
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge branch 'jb/filter-ignore-sigpipe'
into
m
ain
t
commit
|
commitdiff
|
tree
2012-03-05
Juni
o
C Hamano
Merge bra
n
ch 'sp
/
smart-http-failure-to
-
push
'
into main
t
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
H
a
m
ano
Merge branch 'tr/maint-bundle-long-sub
j
e
ct' into
m
aint
commit
|
commitdiff
|
tree
2012-03-05
C
l
e
m
ens Buchacher
http
.
proxy: a
l
so mention http
s
_proxy and
all_pro
x
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-03
Micha
e
l J G
r
uber
t0
3
00: wo
r
k
a
round bug in das
h
0
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-03
T
o
m
Gr
e
n
nan
t5512
(l
s
-re
m
ote)
:
moder
n
i
z
e
style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-02
S
t
efano
L
atta
r
ini
tests: fix spurious error when
r
un directly with Solaris
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-02
Juni
o
C
Hamano
Documentation: do not as
s
ume t
h
at n > 1 in
<rev>~$n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thomas Rast
bundle:
k
e
e
p
around n
a
mes passed to add_pending_object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thomas Rast
t5510: ensu
r
e we st
a
y in the toplevel
t
est dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thomas Ra
s
t
t5510: re
f
act
o
r bundle->pack con
v
ersion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C
H
amano
diff -p: squelch "dif
f
--gi
t
"
he
a
der for sta
t
-
d
irty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hama
n
o
t4
0
11: ill
u
strate "diff
-
inde
x
-p" on s
t
at-dirty paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
t4011: modernise style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Libor Pechacek
D
o
cu
m
en
t
ation fixe
s
i
n gi
t
-config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Carlos
Ma
r
tí
n
N
i
eto
Do
c
umentation
:
use {asterisk} i
n
rev-list-
o
ptions
.
tx
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
J
a
kub
Narebski
gitweb: Han
d
le
i
nva
l
id regexp in
reg
e
xp search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Nguyễn Thái Ngọc Duy
rev
-
list: fi
x
--verify-o
b
ject
s
--quie
t
becomin
g
--objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Nguyễn Thái
Ngọc Duy
rev-list:
r
emove BISE
C
T_SHOW_T
R
IED flag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Juni
o
C
H
amano
Update dra
f
t
r
elease
n
ot
e
s to 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C
H
amano
Merge b
r
anch
'
pj
/
remote-set-branches-usage
-
fix' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge branch 'jn/git
w
eb-unb
o
rn-head' into mai
n
t
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C Hamano
Merge branch 'jn/ancient-meld-s
u
pport' i
n
to m
a
int
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o
C
Hamano
M
erge b
r
anch 'tr
/
me
r
g
e-e
d
it-guidance'
into maint
commit
|
commitdiff
|
tree
2012-02-27
T
i
m Henig
a
n
Codi
n
gGuidelines: do not use 'which' i
n
shell scri
p
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Tim Henigan
CodingGuidelines: A
d
d
a note ab
o
u
t
sp
a
c
e
s after
r
edire
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Carlos Martín Ni
e
to
branch
:
don
'
t assume the mer
g
e filter ref exists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Michael H
a
ggerty
post-receive-email: matc
h
up $L
O
GBEGIN
.
.
$
L
OGEND pairs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
M
i
chael Haggerty
post-r
e
ceive
-
email: remove unused variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
J
u
n
i
o C Hamano
test: "am -3
"
can
a
ccept non-stand
a
rd -p<num>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Juni
o
C Hamano
D
o
c
ument acc
u
mulated fixes s
i
nce 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio
C
Ham
a
n
o
Me
r
ge br
a
nch
'jc
/
add-refresh-unmer
g
ed' in
t
o
maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C H
a
mano
Merge branch 'js
/
config
u
re-lib
i
ntl' into maint
commit
|
commitdiff
|
tree
2012-02-27
J
unio C
H
a
m
ano
S
ync with 1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
J
un
i
o
C Hama
n
o
Git 1
.
7
.
8
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
M
i
chał
Kiedrowicz
g
rep
-
P
:
Fix
matchi
n
g ^ and
$
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Jim
Meyeri
n
g
am:
don't infloop for an emp
t
y i
n
p
u
t file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
A
ndrew Wong
rebas
e
-m: only call "notes copy" when rewritt
e
n
exists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pet
e
Wyckof
f
git-p4: remove bash
-
ism
i
n t9800
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wycko
f
f
git-p4:
remove b
a
sh-is
m
in t9809
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyck
o
f
f
gi
t
-
p
4: fix submit r
e
gre
s
sio
n
with clientSpec a
n
d subdir
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pet
e
Wyckoff
git-p4: set u
s
eClie
n
tSpec variable on
i
nitial
c
lone
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-26
Dmit
r
y V
.
Levin
Makefile: add
thread-utils
.
h to LI
B
_H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-24
Je
f
f King
d
o
not stream large files to
p
ack whe
n
f
i
lters
are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next