repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge: teach -Xours/-Xtheirs to binary ll-merge driver
2012-09-09
Junio C Ha
m
ano
me
r
ge: teach -X
o
urs/-Xtheirs to binary ll
-
merge
dri
v
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Hamano
Sync
w
i
t
h 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio
C
Ham
a
no
Git 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Hamano
Sync with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
G
it 1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jonath
a
n Nied
e
r
bundle:
r
emove
stray single
-
quot
e
from error mes
s
age
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 Hamano
Merge branch 'maint-1
.
7
.
8'
in
t
o
main
t
-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge
b
r
anch 'jc/maint-verify-
o
bje
c
ts-remove-p
e
ssimis
m
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Mer
g
e branch '
d
w/gitweb-doc-grammo' i
n
to maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C
H
amano
Merge branch
'tr/c
a
c
h
e
-tree
'
i
nto maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C
Hamano
Mer
g
e branch 'cb/main
t
-t5541-make-server-port-por
t
able
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C
Haman
o
M
e
rge b
r
anch 'cn/maint-r
e
v
-list-
d
oc' into
m
a
int-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C H
a
m
ano
M
erge br
a
n
c
h 'tr/ma
i
nt-bundle-boundary' in
t
o m
a
int
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C H
a
mano
M
erge br
a
nch '
t
r/maint-bundle-long-subject' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io
C
Hamano
Merge branch 'ph
/
rerere-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Git 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Merge b
r
a
n
ch
'jc/maint-merge-autoedit' int
o
maint
commit
|
commitdiff
|
tree
2012-03-30
Heiko V
o
igt
string-list
:
d
o
cument that st
r
in
g
_list_insert() i
n
se
r
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
J
u
nio C H
a
mano
G
i
t 1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio
C Hamano
Merge bran
c
h 'j
n
/mai
n
t-fast-
i
mpor
t
-empty-ls' into
m
aint
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
M
e
r
ge
b
ranch
'ph/rerere-doc
'
into
m
aint
commit
|
commitdiff
|
tree
2012-03-26
J
u
nio C Hamano
M
erge branch 'ms/maint-co
n
fig-
e
rror-at-
e
o
l-line
c
ount
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
M
a
rk Lodato
gr
e
p doc:
a
dd --bre
a
k
/ --heading / -W to s
y
nopsi
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Rodrigo Silva (Mestr
.
.
.
D
o
cumentation: improve des
c
ription
of GIT
_
EDIT
O
R
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Ne
l
son Benitez L
e
on
documentation: fix al
p
hab
e
t
i
c ordered
list for git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
D Wa
i
tzm
a
n
Docum
e
ntation/gitweb: t
r
i
v
ial English
f
ixes
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio C Hamano
M
e
r
ge branch 'maint-1
.
7
.
8' into maint
commit
|
commitdiff
|
tree
2012-03-20
Junio C Haman
o
merge: backp
o
rt GIT_MER
G
E_AUTOEDIT support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge b
r
anch
'ks/sort
-
wildcard-in-makefile' into main
t
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge branch 'jc/a
d
v
i
se-i18n' into m
a
int-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge bran
c
h 'jn/gitweb-unspecified
-
action'
in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Jun
i
o
C
Hamano
f
etch/rece
i
ve:
r
e
move over-pes
s
imistic conne
c
t
i
vity
.
.
.
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 Hamano
Me
r
ge branch '
t
r/m
a
int-bundl
e
-boundary' into maint
commit
|
commitdiff
|
tree
2012-03-12
Jun
i
o C Ha
m
ano
Merge branch 'jc/mai
n
t-dif
f
-patch-header' in
t
o maint
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge branch 'jn/maint
-
do-
n
ot-
m
atch-with-unsanitize
d
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio C
Hama
n
o
Merge br
a
nc
h
'jc/am-3-
n
onstandard-
p
opt' into maint
commit
|
commitdiff
|
tree
2012-03-12
Martin
S
t
e
nberg
co
n
f
i
g
: report er
r
ors
a
t the
EO
L
w
ith
c
orr
e
ct li
n
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil Ho
r
d
rerere:
Document 'rerer
e
remaining'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Jakub Narebski
gitweb:
Fix fixed string
(non-regexp) project search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
T
homas Rast
t
5
704:
f
i
x nonportabl
e
sed/grep usages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Junio C
Hama
n
o
Merge branch
'
maint-1
.
7
.
8' into maint
commit
|
commitdiff
|
tree
2012-03-06
Junio C Ham
a
no
Merge
b
r
anch 'maint
-
1
.
7
.
7' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-06
Thomas
R
as
t
Do
c
u
m
e
nt
t
he -
-
hi
s
togram diff opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hama
n
o
G
i
t
1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C H
a
man
o
Mer
g
e branch 'jc/doc-merge-options'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge
branch 'cn/maint-rev-list-doc' into maint
commit
|
commitdiff
|
tree
2012-03-05
Thomas Ra
s
t
fast-im
p
o
r
t: zero all of 'struct tag' to
s
ilence valgri
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Ham
a
no
Updat
e
draft release
n
otes to 1
.
7
.
9
.
3
f
or the las
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
J
unio C H
a
mano
Me
r
ge branc
h
'cn/ma
i
nt
-
branch-with
-
b
ad' into maint
commit
|
commitdiff
|
tree
2012-03-05
J
unio C
H
amano
Merg
e
branch 'jn/maint-gitweb-inva
l
id-rege
x
p' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio C Hamano
Merge branch 'nd/maint-verify-objects' in
t
o maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Ham
a
n
o
Me
r
ge branc
h
'j
k
/ma
i
nt-avoid-str
e
a
m
ing-filtered-contents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io C Hama
n
o
Me
r
ge branch 'jb/f
i
l
t
e
r-ig
n
o
re-s
i
gpipe'
into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
M
e
rge branch 'sp/smart-http-failure-to-push' into maint
commit
|
commitdiff
|
tree
2012-03-05
J
unio C Hamano
Merge b
r
a
n
ch 'tr/maint
-
bund
l
e-lo
n
g-su
b
j
ect' into mai
n
t
commit
|
commitdiff
|
tree
2012-03-05
Clemens Buchacher
http
.
proxy: also m
e
ntion https_proxy and
all
_
p
roxy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-03
Michael J
G
ruber
t0300: wor
k
around bug
in dash
0
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-03
Tom Grennan
t55
1
2
(ls-remote): modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-02
S
t
efano Latta
r
ini
tests: fix spurious e
r
ror wh
e
n r
u
n directly with S
o
laris
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-02
J
unio C H
a
mano
Documentat
i
on: do not assume that
n > 1 in <rev>
~
$
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thoma
s
R
as
t
bundle
:
keep around
n
ames passed
t
o add_pend
i
n
g_object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thomas Rast
t551
0
: ensur
e
we
stay in th
e
toplev
e
l test dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Tho
m
as R
a
st
t
5510
:
refactor bundl
e
->pack co
n
versi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C
Hamano
dif
f
-
p
:
s
q
uelch "diff
--git" header for stat-dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
t4011: illus
t
rate "di
f
f-
i
ndex -p" on stat-dirty paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Haman
o
t
4
011: modernise style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
L
i
bor Pechacek
Documentation fixes in
g
it-
c
onfig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Carl
o
s Martín
N
ieto
Doc
u
menta
t
ion
:
us
e
{
asterisk}
i
n rev-
l
i
st-
o
ptions
.
txt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Jak
u
b Narebski
git
w
eb: 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
rev-
l
ist: f
i
x
--verify-
o
b
j
ects --quiet becoming --objec
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Nguyễn T
h
ái Ngọc Duy
rev-list: remove BISECT_SHOW_TRIED f
l
ag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Ha
m
ano
Upd
a
te draft release notes to 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C
H
am
a
no
Merge branch 'pj/remote-set-branches-usage-fix'
into
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge br
a
nch '
j
n/git
w
eb-unborn-head' int
o
ma
i
n
t
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge branch 'jn
/
ancient-meld-support' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C
H
amano
Merge branch 'tr/m
e
rge-edi
t
-
g
uidan
c
e' into maint
commit
|
commitdiff
|
tree
2012-02-27
Tim Henigan
CodingG
u
idelines: do not use 'whic
h
' in shell scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Tim Heniga
n
CodingGuid
e
l
i
n
es: Add a note about space
s
a
f
ter redirection
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Carlos Martín
N
ieto
b
ranch: don't assume the merge f
i
lt
e
r ref exists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Michael Hagg
e
rty
po
s
t-receive-ema
i
l: ma
t
ch up $LOGBEGIN
.
.
$LOGEND pairs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Michael
H
agg
e
rty
post-receive-email: remo
v
e unused variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C Hamano
test: "am -3" can accept no
n
-standard -p<num>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C Hamano
Doc
u
m
ent accumu
l
ate
d
f
ixes since 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
J
u
n
io C Ha
m
ano
M
erge b
r
anch 'jc/add-re
f
resh-unmerged' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge br
a
nc
h
'js/c
o
nfigure-libi
n
tl'
i
nto maint
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o
C
H
a
mano
Sync
with 1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Junio
C
Hama
n
o
Git 1
.
7
.
8
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Michał Kiedrow
i
c
z
grep -P: Fix matching ^
a
nd
$
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Ji
m
Meyering
a
m: don't i
n
floop for an em
p
ty input file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Andr
e
w
W
ong
rebase -m: o
n
l
y c
a
ll "notes copy"
w
hen
r
ewritt
e
n exist
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete
W
yckoff
git-p4: remove bash-ism in t9800
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wy
c
koff
g
it-p4
:
remove b
a
s
h
-
i
sm in t9809
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pe
t
e Wyck
o
f
f
git-p4: fix submit regres
s
ion wi
t
h clientSpec and subdir
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyckoff
gi
t
-
p
4: set useClientSpec variable
o
n initial clone
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-26
Dm
i
try V
.
Levin
Make
f
i
l
e: add
t
hread-utils
.
h
to LIB_H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-24
Je
f
f Ki
n
g
do
n
ot st
r
e
am
l
arge files
t
o pack wh
e
n
f
ilters
a
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-24
Jeff King
teach dr
y
-run convert_to_git not
t
o require a sr
c
buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-24
Jeff King
teach conver
t
_to_gi
t
a "dry
r
un
"
mod
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next