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
ll-merge: warn about inability to merge binary files only when we can't
2012-09-12
Junio C Hamano
ll-me
r
g
e
: warn abou
t
inability to mer
g
e bin
a
ry files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
J
unio C H
a
mano
at
t
r
:
"binary" attri
b
ute should choo
s
e built-in
"
binary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
Junio C
H
amano
m
e
rge: teach -Xour
s
/
-Xtheirs
to
b
inary ll-merge driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Hama
n
o
Git 1
.
7
.
9
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
m
a
no
Sync with
1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ha
m
ano
Git 1
.
7
.
8
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Hamano
S
y
nc w
i
th 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
J
unio C H
a
m
ano
Git 1
.
7
.
7
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Jonathan Nieder
bu
n
dle: remove stray si
n
gle
-
q
uote from 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 'maint-
1
.
7
.
8' in
t
o
ma
i
nt-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio
C
Ha
m
an
o
Merge b
r
anch
'
jc/maint-verify-objects-remove-pessimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
i
o
C
H
amano
Me
r
ge br
a
nch 'dw/git
w
e
b-doc-gram
m
o' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C H
a
mano
Me
r
ge bra
n
c
h 'tr
/
c
a
che-t
r
e
e
'
int
o
m
a
int-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C
Hama
n
o
Merge branc
h
'cb/mai
n
t-t5541-make-se
r
v
e
r-port-portable
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Jun
i
o C Ha
m
ano
Merge branc
h
'cn/maint-re
v
-list-doc'
into maint
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Hamano
Mer
g
e
b
ra
n
ch '
t
r/maint-bundle-boundary' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Hamano
Merge branch 'tr/maint-
b
undle-l
o
ng-subjec
t
' i
n
to
maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C
Haman
o
Merge branch 'ph/
r
erere-do
c
' into
m
aint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Junio C Haman
o
Git 1
.
7
.
9
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-02
Juni
o
C Hamano
M
erge
b
ranch 'jc/m
a
int
-
me
r
ge-autoedit
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-03-30
Hei
k
o Voig
t
stri
n
g-l
i
st: d
o
cument that stri
n
g_list_i
n
sert() in
s
ert
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
J
unio C
H
amano
Merge branch 'jn/maint-fast-import-empty-ls' into ma
i
nt
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
M
e
rge
b
ranch 'ph/r
e
rere-doc'
i
nt
o
maint
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
io C Hamano
Merge branch
'
ms/
m
aint-config-e
r
ror-at-eol-lineco
u
nt
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mark Lodato
g
r
ep
doc: ad
d
--break /
--head
i
ng /
-
W to synopsis
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Rodrigo Si
l
va (M
e
str
.
.
.
Documentation: im
p
rove description of GI
T
_EDITOR
and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Nel
s
on Beni
t
ez Leo
n
docum
e
ntati
o
n: fix
a
lphabetic ordered
l
is
t
for git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-23
D W
a
itzm
a
n
D
o
cumentation/gitweb: tr
i
v
ial Engl
i
sh fi
x
es
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio C Hamano
M
erge branch
'
mai
n
t
-
1
.
7
.
8' into maint
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
merge: backport GIT_MERGE_AUTOEDIT support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-20
Junio
C
Ha
m
a
no
Merg
e
branc
h
'
ks/sort-wi
l
dcard-in-ma
k
efile
'
into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Juni
o
C Ham
a
n
o
M
e
rge branch
'
jc/advise-i18n'
i
nto m
a
int-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio C
Ha
m
a
n
o
M
e
r
ge branch
'jn/gitwe
b
-
u
nspeci
f
ied-action' i
n
to
m
a
in
t
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
J
u
nio C Hamano
fetc
h
/
r
eceive: remove over-pessimistic
c
onnectivity
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Junio C
H
amano
Git 1
.
7
.
9
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
J
unio C Hamano
Merge branch 'tr/
m
aint-
b
undle-boundary' into maint
commit
|
commitdiff
|
tree
2012-03-12
Ju
n
io C Hama
n
o
Merge branch 'jc/
m
a
i
nt-diff-p
a
t
c
h-header' into main
t
commit
|
commitdiff
|
tree
2012-03-12
Junio C H
a
mano
Merge branch
'
jn/
m
aint-do-not-ma
t
ch-with-unsanitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
J
unio C Hamano
Merge branch 'jc/am-
3
-nonstandard-popt' into main
t
commit
|
commitdiff
|
tree
2012-03-12
M
artin
Stenb
e
rg
config: repo
r
t errors
at the
EOL w
i
th correct line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-08
Phil
Hord
rerere: Docume
n
t 'rerere remaining'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-06
J
ak
u
b
Na
r
ebski
gitweb:
F
ix f
i
xed st
r
i
n
g (non-regexp) p
r
oj
e
ct searc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-06
T
h
o
m
as Rast
t5704: fix nonportable
s
ed/grep usages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-06
Ju
n
i
o C Hamano
Mer
g
e b
r
an
c
h '
m
aint-1
.
7
.
8
'
into mai
n
t
commit
|
commitdiff
|
tree
2012-03-06
Junio C
Haman
o
M
erge bran
c
h 'main
t
-
1
.
7
.
7
'
into mai
n
t-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-06
Thomas Rast
D
o
c
u
m
e
nt the
--hi
s
to
g
ram diff optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Gi
t
1
.
7
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
J
u
ni
o
C H
a
mano
Merge b
r
an
c
h 'jc/do
c
-merge-
o
pt
i
ons
'
into
m
aint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
M
erge branch 'cn/maint-rev-list-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2012-03-05
T
ho
m
as Rast
f
a
st-im
p
o
r
t: zero all of 'st
r
uct tag' to silence valgri
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Junio C
H
amano
U
p
d
a
te draft release not
e
s to 1
.
7
.
9
.
3 for the last
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o C
H
ama
n
o
M
erge branch 'cn/ma
i
nt-branch-with-bad
'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2012-03-05
Junio C H
a
mano
Merge br
a
nch
'
jn/maint-gitwe
b
-invalid-r
e
gexp'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merg
e
br
a
nch 'nd/m
a
int-
v
er
i
f
y
-ob
j
ects' into ma
i
nt
commit
|
commitdiff
|
tree
2012-03-05
Junio
C H
a
mano
Merg
e
branc
h
'j
k
/maint-avoi
d
-s
t
re
a
ming-filter
e
d-contents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o
C Hamano
Merge branch 'jb/
f
ilte
r
-i
g
n
o
r
e-sigpipe' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C H
a
m
a
no
Merge branch 'sp/smart-http-failure-to-push' into mai
n
t
commit
|
commitdiff
|
tree
2012-03-05
Junio
C Hamano
Merge bran
c
h 'tr/maint-b
u
ndle
-
l
ong-subject' into mai
n
t
commit
|
commitdiff
|
tree
2012-03-05
C
l
emens Bu
c
h
a
cher
h
ttp
.
proxy: also mention https_proxy and all_proxy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-03
Mic
h
ael
J
Gru
b
er
t03
0
0: 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 Gren
n
an
t5512 (l
s
-rem
o
te):
modernize styl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-02
Stef
a
no Lattarin
i
tests:
fix spurious e
r
ror when run dire
c
t
ly with Solaris
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-02
Junio C Ha
m
ano
Documen
t
a
ti
o
n
: do
n
o
t
assume tha
t
n > 1 i
n
<rev
>
~$n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
T
h
o
mas Ra
s
t
bundle: keep around names passed to ad
d
_p
e
nding_
o
bj
e
ct()
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 test
dir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
T
h
o
mas Rast
t5510:
r
efactor bundle
-
>pac
k
conve
r
sion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
d
i
ff -p: sque
l
ch
"diff --git" head
e
r for stat
-
d
i
rty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Jun
i
o C H
a
m
a
n
o
t4011: ill
u
strate "diff-index
-p" on stat
-
dirty paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Junio C
H
a
m
ano
t
4
011:
m
odern
i
se style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Libor
P
echacek
Do
c
umentation f
i
xes
i
n
g
i
t-confi
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
Carlos Mart
í
n N
i
eto
Documentation: use {asterisk} in rev-list-options
.
tx
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
J
a
kub N
a
r
ebski
gitweb
:
Handle invalid r
e
gexp
i
n regexp sear
c
h
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: fix -
-
verify-objects --quie
t
becoming
-
-
o
b
jects
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
rev-list: remo
v
e BISECT_SHO
W
_
TR
I
ED flag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
J
unio C
H
a
m
ano
Update d
r
aft
r
e
lease notes to 1
.
7
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o C Haman
o
Me
r
ge
branch 'pj/re
m
ote-set
-
branches-usage-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Juni
o
C Hamano
Merge b
r
a
nch 'jn/gitweb-unb
o
rn-head
'
into
maint
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C Ha
m
a
n
o
Merge branch '
j
n/
a
n
cient-meld-su
p
port' i
n
t
o maint
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o C Hamano
M
e
rge branch 'tr/merge-edit
-
guidanc
e
' into
m
aint
commit
|
commitdiff
|
tree
2012-02-27
Tim Henigan
CodingGuideli
n
e
s
: do
n
ot us
e
'w
h
ich' in shell scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Tim Henig
a
n
CodingGuidelines: Add a note about spaces a
f
ter
redirection
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Carlos Martín Nie
t
o
branch
:
don't as
s
ume
t
h
e merge filter ref exists
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Mi
c
hael Haggerty
post-re
c
eive-email
:
match up
$LOGBEGIN
.
.
$LOGEND pairs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Michael Haggert
y
post-receive
-
em
a
il: remove
u
nused vari
a
ble
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
test: "am -3" c
a
n ac
c
ept no
n
-st
a
nda
r
d -p<num>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Ha
m
ano
Do
c
ume
n
t accumulated
fix
e
s since 1
.
7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge branch
'
jc/a
d
d-refresh
-
unmerge
d
' into ma
i
nt
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o C Ha
m
ano
Merg
e
bran
c
h 'js/configure-libin
t
l' into main
t
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C H
a
mano
Sync with 1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
G
i
t 1
.
7
.
8
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Michał
Kiedrowicz
g
r
ep -P:
F
ix matching ^ and $
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Jim Meyer
i
n
g
am: don't infl
o
op for an empty
input file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Andrew Wo
n
g
rebase -m
:
o
nly call "
n
o
t
e
s cop
y
" when rewritten exists
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyckoff
g
i
t-p4: remove bash-
i
sm in t9800
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
P
et
e
W
yckof
f
g
i
t-
p
4: remove bash-ism in t9809
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pet
e
W
ycko
f
f
git-p4: fix su
b
mit reg
r
essio
n
w
i
th clie
n
tSpec and
subdir
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pe
t
e Wyckoff
git-p4: set useClientSpec vari
a
ble on initial clone
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-26
Dmitry V
.
Levin
M
a
ke
f
ile: add thread-
u
tils
.
h to
LIB_
H
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-24
Jeff
King
do
n
ot stream large fi
l
es to pack
w
h
en filters are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next