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
Junio
C Haman
o
ll-m
e
rge: warn about inabilit
y
to merge binary files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
J
unio C Hamano
att
r
: "
b
inary"
attribute should choose built-
i
n "b
i
nary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
J
u
nio C Hamano
me
r
g
e: teach -Xours/-Xtheirs to
b
in
a
r
y
ll-merge driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C Hamano
G
i
t 1
.
7
.
9
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o C Hamano
Sync with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Hamano
Gi
t
1
.
7
.
8
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hama
n
o
Sync wi
t
h 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
H
amano
Git 1
.
7
.
7
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Jonat
h
an Nieder
bun
d
le:
remove stray single-quote fro
m
error
mess
a
ge
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 Hama
n
o
Merge branch
'
m
a
i
nt-1
.
7
.
8' in
t
o ma
i
nt-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
J
unio
C
Hamano
Merge
bra
n
ch 'jc/maint-v
e
rify-obj
e
cts-remove-pe
s
simism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C Ha
m
ano
Merge branch 'dw/g
i
tweb
-
doc-grammo' in
t
o
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Haman
o
Me
r
ge bra
n
ch 'tr/cache-tree' i
n
to maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C
H
aman
o
Merge b
r
a
nch 'cb/maint-t5541-make-server-port
-
porta
b
le
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C H
a
mano
Merg
e
branc
h
'cn
/
maint-rev-list
-
doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio
C
H
am
a
no
Me
r
ge br
a
nch 'tr/maint-bundle-bo
u
ndary' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Jun
i
o C Hamano
M
e
rge bran
c
h 'tr/maint-
b
u
n
dle-long-subject' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
un
i
o C Ham
a
n
o
Merge branch 'ph/rerere-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
J
u
nio C
Hamano
Git 1
.
7
.
9
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-02
J
unio C Haman
o
Merge branch 'jc/maint
-
merge-autoedit' into maint
commit
|
commitdiff
|
tree
2012-03-30
Hei
k
o
Vo
i
gt
st
r
ing-list:
d
o
c
ument tha
t
string
_
list
_
insert(
)
inserts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
io C Hamano
Git
1
.
7
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Ha
m
ano
Merg
e
bran
c
h 'j
n
/
maint-fast-import-empty-ls' into maint
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
i
o
C Hamano
Merge bran
c
h 'ph/
r
e
r
ere-do
c
'
in
t
o main
t
commit
|
commitdiff
|
tree
2012-03-26
Junio
C Ha
m
ano
Merge bra
n
ch 'ms/maint
-
config-error-
a
t-eol-linecou
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mark
Lodat
o
grep doc: add --break / --heading / -W to synopsis
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Rodrigo Silva (Mestr
.
.
.
D
o
cum
e
ntation: improve descr
i
ption of
GIT_EDITOR and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
N
elson Benitez Leon
documen
t
atio
n
: fix alphabetic
ordered list
for git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-23
D Wai
t
zman
Docume
n
tation/gitweb: tr
i
vial
E
nglish fix
e
s
commit
|
commitdiff
|
tree
2012-03-20
Juni
o
C Hamano
M
erge
bran
c
h 'm
a
i
n
t-1
.
7
.
8' into maint
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio C Hamano
m
e
rge: bac
k
port GIT_MERGE_AUTOEDIT suppo
r
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge
b
r
anch 'ks/sort-wil
d
c
a
rd
-
in-makefile' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge branch 'j
c
/advise-i18n' int
o
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
J
un
i
o C Hamano
Merge branch 'jn/gitweb-unspe
c
i
f
ied-action' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Junio C Hamano
fetch/receive:
re
m
ov
e
o
v
er
-
pessimis
t
i
c
co
n
ne
c
t
i
vit
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Jun
i
o C Ha
m
ano
Git 1
.
7
.
9
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Jun
i
o C Hamano
Merg
e
branch 'tr/maint-bund
l
e-bo
u
n
d
ary' into m
a
int
commit
|
commitdiff
|
tree
2012-03-12
Jun
i
o C Haman
o
Merge branch 'jc/mai
n
t-
d
iff-patch-header'
int
o
maint
commit
|
commitdiff
|
tree
2012-03-12
Junio C Ham
a
n
o
Merge br
a
nch 'jn/
m
aint-do-not-ma
t
ch
-
with-unsanitize
d
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hama
n
o
Merge br
a
nc
h
'
jc/am-3-
n
onstan
d
a
rd
-
pop
t
'
i
n
to maint
commit
|
commitdiff
|
tree
2012-03-12
Martin Stenberg
config: report errors
at t
h
e E
O
L
with
c
orr
e
ct
l
ine
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-08
Phil Hord
rere
r
e
:
Document '
r
erere remaining'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-06
Jakub Na
r
ebski
gitweb: F
i
x
fixed s
t
r
i
n
g (non-regexp) project s
e
a
r
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-06
Th
o
ma
s
Rast
t570
4
: fix nonportable sed/
g
re
p
u
sages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-06
Junio
C
H
a
mano
Merge branch 'maint-1
.
7
.
8' into maint
commit
|
commitdiff
|
tree
2012-03-06
Junio C H
a
man
o
M
er
g
e branch
'
maint-1
.
7
.
7'
into main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-06
Thomas Ra
s
t
Document the
-
-h
i
st
o
gram
d
iff option
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
Junio
C
Hamano
Me
r
ge branch
'
jc/doc-m
e
rge-optio
n
s
' in
t
o main
t
commit
|
commitdiff
|
tree
2012-03-05
Juni
o
C Hamano
M
erge
branch 'cn/main
t
-rev-l
i
s
t
-
doc' into maint
commit
|
commitdiff
|
tree
2012-03-05
Thomas Rast
fast-import: zer
o
a
l
l of
'
st
r
uct tag' to silence
va
l
gr
i
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io C
Hamano
Update dr
a
ft release notes to 1
.
7
.
9
.
3 for the last
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Junio
C H
a
m
a
no
M
erge
b
r
anch 'cn/
m
ai
n
t-
b
r
a
nc
h
-wit
h
-
bad' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio
C Hamano
Merge
branch 'jn/maint-git
w
eb-invalid
-
regexp'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o C Hamano
Me
r
ge bran
c
h 'nd/maint-verify
-
objects' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-03-05
Juni
o
C
H
a
mano
Merge b
r
anch '
j
k/
m
a
int
-
a
void-streaming
-
filte
r
ed
-
contents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio
C Hamano
M
erge branc
h
'jb/fi
l
ter-i
g
nore-sigpipe'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2012-03-05
Junio
C Ha
m
a
n
o
Merge branch 'sp/s
m
art-http-failure-to-
p
ush' int
o
maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge bran
c
h 'tr/maint-
b
und
l
e-
l
o
ng-subj
e
ct' into maint
commit
|
commitdiff
|
tree
2012-03-05
Cl
e
mens Buchacher
http
.
p
rox
y
: also mention http
s
_
proxy and all_proxy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-03
Michael J Grube
r
t0300: work
a
round bug in dash 0
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-03
To
m
Grenna
n
t5512
(
l
s-r
e
m
ote)
:
mo
d
ernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-02
Stefan
o
Lattar
i
ni
tests: fix
spurious error when ru
n
directly wi
t
h Sol
a
ris
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-02
Junio
C
H
ama
n
o
Documentati
o
n
:
do not assume tha
t
n >
1
i
n <re
v
>~$n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Thomas
Rast
b
u
ndle: keep
a
round n
a
mes passed to add_pend
i
ng_ob
j
ect
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
T
h
omas Ra
s
t
t55
1
0: ensure we stay 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
t
5
510: refactor
b
undle->
p
ack conversion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Ham
a
no
di
f
f -p: s
q
uelch "d
i
f
f
--git" heade
r
fo
r
stat-dirty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
J
u
nio C Hamano
t4011: il
l
ustrate "diff-index -p" on stat-dirty paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Ju
n
io C Ha
m
ano
t4
0
11: modernise style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Libor Pe
c
hacek
Documentation fi
x
es in git-config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
Carlos Ma
r
tín Ni
e
to
Documentation
:
use {asterisk}
i
n
r
ev-list-options
.
t
x
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
J
akub Narebski
gitweb: Handle invalid regexp in regexp
search
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
Nguyễ
n
Thái Ngọc Duy
re
v
-l
i
st: fix --ver
i
f
y-objects -
-
quiet beco
m
ing --objec
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
N
g
u
yễn Thái Ngọc Duy
rev
-
l
i
st: remove BISECT_SHO
W
_TRIED flag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
U
p
date draft
r
elease notes to 1
.
7
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C H
a
mano
Merge branc
h
'pj/remote-set-branches-usage-fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Junio C
H
aman
o
Merge bran
c
h 'jn/g
i
tweb-unborn-head'
into maint
commit
|
commitdiff
|
tree
2012-02-27
J
u
n
io
C
H
ama
n
o
Merge branch 'jn/ancient-me
l
d-support
'
int
o
m
a
int
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o C
H
amano
Merge branch 'tr/merge-edit-gu
i
danc
e
' into maint
commit
|
commitdiff
|
tree
2012-02-27
Ti
m
Henig
a
n
CodingGuidelines: do not use 'wh
i
c
h'
in s
h
e
l
l scr
i
pts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
T
im Henigan
Co
d
i
n
gGu
i
delines: A
d
d a
n
ote about spaces a
f
t
er
r
e
di
r
ection
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Carl
o
s Martín Nieto
branch:
d
on't as
s
ume the merge filter ref exists
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Mich
a
el Haggerty
p
o
st-re
c
e
i
ve
-
email
:
match up $LOGBEGIN
.
.
$
L
OGEND
p
airs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Micha
e
l Haggerty
post-receive-e
m
a
i
l: remo
v
e unused variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o C Ha
m
ano
te
s
t: "
a
m -3" can accept n
o
n-standard -p<num>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C H
a
mano
Docum
e
n
t accumulated fixes si
n
ce 1
.
7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C
Hamano
Merge branch 'jc/add-refresh-
u
n
merged' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge branch '
j
s/configure
-
libintl' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Sync with 1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Junio C Ham
a
no
Git 1
.
7
.
8
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Michał Kiedrowi
c
z
grep -
P
:
Fix matching ^ and $
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Jim M
e
y
ering
am:
don't i
n
fl
o
op for an empty input file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Andr
e
w
W
ong
r
ebas
e
-m: only cal
l
"
n
otes
copy" when
r
ewritten exi
s
ts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pe
t
e Wycko
f
f
git-p4: remove ba
s
h-
i
sm in
t
9800
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyckoff
git-p
4
:
remove bash-ism
i
n t9809
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyckoff
g
it-p4: fix su
b
mit reg
r
essio
n
with clientSpec
an
d
sub
d
ir
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyc
k
off
gi
t
-p4:
s
e
t
useClien
t
S
p
ec
va
r
iabl
e
on initial c
l
one
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-26
Dmitry V
.
L
e
v
in
M
a
k
e
f
i
le: ad
d
thread-utils
.
h to LIB_
H
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-24
J
e
f
f
Kin
g
do no
t
stream large file
s
to
p
ack
w
hen
filters a
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next