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
Hamano
m
e
r
ge: t
e
ach -Xo
u
rs
/
-Xtheirs to binary
ll-merge driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o
C Ha
m
ano
Git
1
.
7
.
9
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
J
u
n
i
o C Hamano
Sy
n
c with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
J
u
ni
o
C Hamano
Git 1
.
7
.
8
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
ma
n
o
Sync with
1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io
C
Hamano
Gi
t
1
.
7
.
7
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Jo
n
athan
N
ieder
bundle
:
remove stray
s
i
ngle-quo
t
e
f
rom error
m
essage
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
Me
r
ge branch 'maint-1
.
7
.
8
'
into maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio C
H
a
mano
Mer
g
e branc
h
'jc/maint-verify-
o
b
jects-remo
v
e-pessimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge bran
c
h '
d
w/gitweb-doc-gramm
o
'
in
t
o maint
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C
Hamano
Merge branch 'tr/cache-tree' into
m
aint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch 'cb
/
maint-t5541-make-se
r
v
e
r
-
p
o
r
t-port
a
ble
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch 'c
n
/maint-rev-l
i
st-doc' into m
a
int
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Me
r
ge bran
c
h 'tr/maint-bundle-bounda
r
y' into
maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hama
n
o
M
erge branch '
t
r/m
a
i
nt-bundle-lo
n
g-subject' in
t
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio C Ham
a
no
Merge branch 'ph/r
e
rer
e
-
d
oc' into
m
a
i
n
t-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Junio C Haman
o
G
it 1
.
7
.
9
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-02
Junio C
Hamano
M
erg
e
branch 'jc/maint-
m
erge-aut
o
edit' into m
a
int
commit
|
commitdiff
|
tree
2012-03-30
Heiko Voigt
s
t
ring-list: document that strin
g
_list_insert
(
) inserts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Junio C
Hama
n
o
Git 1
.
7
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
J
u
nio C Hama
n
o
Merge
branch 'jn/
m
aint-fast-import
-
e
mpt
y
-ls'
into maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C Ha
m
a
n
o
Me
r
ge b
r
anc
h
'ph/rerere-doc'
i
nto
m
aint
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
i
o
C Ham
a
no
Merge branch 'ms/mai
n
t-config-erro
r
-at-eol-lin
e
c
o
unt
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mark Lodato
grep doc: add --b
r
eak
/
--hea
d
in
g
/ -W to syn
o
p
s
i
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Rod
r
i
go Si
l
va
(
Mestr
.
.
.
Documen
t
at
i
on
:
impr
o
ve description of
G
IT_E
D
ITOR and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Nel
s
on Be
n
itez
Leon
documenta
t
ion:
f
i
x
a
l
phabet
i
c ordered list for git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-23
D Waitzm
a
n
D
o
cume
n
tat
i
o
n
/
gitweb: trivial
E
nglish fixes
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Mer
g
e b
r
anch 'maint
-
1
.
7
.
8' into maint
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
merge:
b
ackport GIT_MERGE_AUT
O
EDIT suppo
r
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hama
n
o
Me
r
ge branch 'ks/sort-wildcard-
i
n
-
make
f
ile
'
into
maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio
C
Hamano
Merge
b
ranch 'j
c
/advi
s
e-i18n
'
int
o
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge
branch 'jn/gitweb-unspeci
f
ied-action'
into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Junio C Ham
a
no
fe
t
ch
/
rece
i
ve: remo
v
e over-p
e
ssimistic conne
c
t
i
v
ity
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Ju
n
i
o C Hama
n
o
Git 1
.
7
.
9
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Junio C
H
ama
n
o
Merge
branch 'tr/maint
-
bundle-boundary' int
o
maint
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hama
n
o
Merge
b
ranch 'jc/m
a
int-
d
iff-patch-h
e
ader' i
n
t
o maint
commit
|
commitdiff
|
tree
2012-03-12
Ju
n
io C Hamano
Me
r
ge branch 'jn
/
maint-do-not
-
ma
t
ch-wi
t
h-un
s
anitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge branc
h
'jc/am-
3
-no
n
standard-popt' into m
a
i
n
t
commit
|
commitdiff
|
tree
2012-03-12
Martin
S
ten
b
erg
conf
i
g:
repo
r
t
e
rrors at the
EOL with corr
e
ct line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-08
Phil Ho
r
d
rerere: Do
c
umen
t
'rerere remai
n
ing'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-06
Jakub N
a
rebski
gitwe
b
:
F
i
x fi
x
ed string (non-regexp)
project
s
ear
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-06
Th
o
mas Rast
t5704: fix nonportable sed/grep u
s
ages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-06
Juni
o
C
H
a
m
ano
Merg
e
branch '
m
aint-1
.
7
.
8' int
o
maint
commit
|
commitdiff
|
tree
2012-03-06
J
u
n
i
o C Hamano
Merge branc
h
'm
a
int-1
.
7
.
7' into main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-06
Thomas Rast
Documen
t
t
h
e --histogram diff option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
Haman
o
Git 1
.
7
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Haman
o
M
erge branch 'j
c
/doc-merge-opt
i
ons'
into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge branch
'
cn
/
m
aint-rev-list-doc' into maint
commit
|
commitdiff
|
tree
2012-03-05
Thomas Rast
fast-imp
o
rt: ze
r
o all of 'st
r
uc
t
tag'
t
o s
i
l
e
nce
valgrind
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Junio
C Hamano
Update
d
r
aft release
n
o
t
e
s t
o
1
.
7
.
9
.
3 for the l
a
s
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
J
u
ni
o
C Hamano
Me
r
ge branch 'cn/maint-bran
c
h-w
i
th-b
a
d
' into main
t
commit
|
commitdiff
|
tree
2012-03-05
J
unio C Ham
a
no
Merge br
a
n
ch
'
jn/mai
n
t-gitwe
b
-inv
a
l
id-regexp' into
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Mer
g
e branch '
n
d/m
a
i
n
t-verify-
o
bjects' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C
H
amano
M
erge bran
c
h
'
jk/
m
aint-avo
i
d-s
t
reaming-filtered-contents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
i
o
C Hama
n
o
Merge
branch
'jb/fi
l
ter-ignore-sigp
i
pe' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merg
e
branch 's
p
/sma
r
t-ht
t
p-failure
-
t
o
-push' into
maint
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio
C Hamano
Merg
e
b
ranc
h
'
tr/mai
n
t-bund
l
e-long-s
u
b
j
ect' into m
a
in
t
commit
|
commitdiff
|
tree
2012-03-05
C
l
e
mens Buchacher
ht
t
p
.
proxy: also mention htt
p
s_
p
roxy and all_proxy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-03
Michael
J
Gruber
t0
3
00: work around bug in dash 0
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-03
T
om Grennan
t5512 (ls-rem
o
t
e
)
:
modernize
s
ty
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-02
Stefano Lat
t
arini
tests: fix spuriou
s
error
w
hen
run
d
i
r
e
c
t
ly with Solaris
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-02
J
u
nio
C
Ham
a
no
Documentatio
n
: do not a
s
s
u
m
e that n > 1 in <rev>~$n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Thomas Rast
bundle: keep ar
o
und names passed to add_pe
n
ding_object
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Thomas Rast
t551
0
: ensure we stay in the to
p
level test dir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Th
o
mas Rast
t55
1
0: refactor bundle->pack
c
on
v
er
s
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Junio C
Haman
o
diff -p:
squelch "diff -
-
git" header for stat-d
i
rty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
J
unio C Hamano
t4011: i
l
lustrate "diff-in
d
ex -p"
o
n stat-
d
ir
t
y paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Junio C
Haman
o
t4
0
11:
moderni
s
e style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Libor Pe
c
hacek
D
ocumen
t
a
tio
n
f
i
xes
in git-config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
Carl
o
s Martín Nie
t
o
Docu
m
e
ntation:
u
se {ast
e
risk} in re
v
-lis
t
-
options
.
tx
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
J
akub Narebski
gitweb
:
Handle invalid rege
x
p in regex
p
s
e
arch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
Nguyễn Thái Ng
ọ
c Duy
rev-list: fix --
v
erify-objects --quiet becoming --objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
Ng
u
yễn Thái Ngọc
D
u
y
rev-list: re
m
ove
BISECT_SH
O
W_T
R
IED flag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
J
unio C
H
amano
U
pdate draft
re
l
e
a
se n
o
tes to
1
.
7
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Haman
o
Merge
b
ranch
'
pj/
r
em
o
te-set-branche
s
-usage-
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C Hamano
Merge branch '
j
n/gitweb-unborn-
h
ead' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hama
n
o
M
e
rge branch 'j
n
/ancient-meld-support'
into maint
commit
|
commitdiff
|
tree
2012-02-27
J
u
ni
o
C Hamano
Merge branch 'tr
/
me
r
ge-edit-guidanc
e
'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2012-02-27
Tim Henigan
C
o
d
ingGuidelines: do
not use 'w
h
ich' in shell sc
r
i
pts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Tim Henigan
Cod
i
ngGuidelines: Ad
d
a
n
o
te about spaces a
f
ter redirection
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Carlo
s
M
a
rt
í
n N
i
e
t
o
branch: don't
a
ssume the merge filter ref exis
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Mich
a
el Haggerty
post-re
c
e
i
ve-ema
i
l:
m
atc
h
up $LOGBEGIN
.
.
$LOGEND
p
a
irs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
M
ichael Ha
g
gert
y
post-rec
e
ive-em
a
il: remove
unused variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
test: "a
m
-
3
"
can a
c
cep
t
n
o
n-stan
d
a
r
d
-p<n
u
m
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Juni
o
C Ham
a
no
Document a
c
cumulated fixes since 1
.
7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o
C Hamano
Merge branch '
j
c/
a
d
d
-refresh-unmerg
e
d
'
into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hama
n
o
M
e
r
g
e bra
n
ch 'js/configure-lib
i
nt
l
'
i
nto m
a
int
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
i
o C Hamano
Sy
n
c
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ł K
i
e
d
row
i
cz
grep -P:
F
ix matching ^ and $
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Jim
M
e
y
er
i
n
g
am: don't infloop for
an
e
mp
t
y input file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Andrew Wong
rebase -
m
:
o
nly c
a
l
l
"notes
copy"
w
hen rewritten exists
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyckoff
git-p4
:
remove b
a
sh
-
ism in t9800
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyck
o
ff
git
-
p4: remove
bash-ism in t9809
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pete
Wyckoff
git-p4: f
i
x submit regressi
o
n with clientSpec a
n
d subdi
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pete
Wyck
o
ff
git-p4: se
t
u
s
e
ClientSpec
v
a
riab
l
e on
i
n
i
ti
a
l
clone
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-26
Dmitry V
.
Lev
i
n
Makefi
l
e: add thre
a
d-utils
.
h to LIB_H
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-24
Jeff
K
ing
do not strea
m
large files to
p
ack
when filt
e
r
s
a
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-24
Je
f
f King
teach dry-run co
n
vert_t
o
_gi
t
n
ot to re
q
uire a src
b
uffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-24
Je
f
f King
teach convert_to_gi
t
a "dry ru
n
" mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next