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
Juni
o
C Hamano
ll-merge: warn ab
o
u
t
inability
to merge
bi
n
ary fi
l
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
Junio C
H
a
m
ano
attr
:
"bina
r
y" attr
i
bute
should ch
o
ose built-in "binary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
Jun
i
o C Hamano
merge: teach
-
X
o
urs/-Xtheirs to b
i
nary ll-merge
dr
i
ver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ham
a
no
Git
1
.
7
.
9
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hama
n
o
S
ync with 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
Junio C Ha
m
ano
S
y
nc with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Git
1
.
7
.
7
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-10
Junio C Haman
o
Merge branc
h
'm
a
int-1
.
7
.
8' into maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merg
e
branch
'jc/main
t
-verify-ob
j
ects-
r
e
move
-
pessimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge bran
c
h '
d
w/gitw
e
b-doc-grammo' into mai
n
t-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hama
n
o
Merge branch 'tr/cache
-
t
r
ee' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C
Hamano
M
erg
e
branch 'cb/maint-t
5
541-make-ser
v
e
r
-port-po
r
t
a
ble
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
i
o
C H
a
mano
Merge bra
n
ch 'cn/main
t
-rev-list-doc' int
o
m
ai
n
t-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
M
e
rge bran
c
h 't
r
/maint-
b
undle-bo
u
ndary' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
unio C Hamano
Me
r
ge branch
'
tr
/
maint-b
u
n
d
le-long-subjec
t
'
i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Haman
o
M
erge branch 'ph
/
re
r
ere-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Junio C H
a
mano
Git
1
.
7
.
9
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Merge branch 'jc/maint-merge-autoedit'
i
n
t
o maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C H
a
mano
Git 1
.
7
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Juni
o
C Ha
m
ano
Mer
g
e branch 'jn/m
a
int-fas
t
-i
m
port-empty-ls' into maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hama
n
o
Merg
e
branch 'ph/rere
r
e-doc' into
m
aint
commit
|
commitdiff
|
tree
2012-03-26
Jun
i
o C Hamano
Merge branch 'ms/main
t
-confi
g
-error-at-eol
-
l
i
necount
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Ham
a
n
o
Mer
g
e branch 'maint-1
.
7
.
8'
i
nto maint
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
merge: b
a
ckport GIT_MERGE_A
U
TOEDI
T
su
p
port
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-20
J
unio C Haman
o
Mer
g
e b
r
anch 'ks/sort
-
wil
d
card-
i
n-mak
e
file' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
J
unio C Hamano
Merge branc
h
'jc
/
advise-
i
18n' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio C H
a
m
a
no
Merge branch 'jn
/
gitweb-
u
n
s
pecified
-
actio
n
'
into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Ju
n
i
o
C Hamano
fetch/receive: remove over-pe
s
simistic connectivity
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Juni
o
C Haman
o
Git
1
.
7
.
9
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Junio
C
Ha
m
ano
Me
r
g
e
b
ra
n
ch 'tr/maint-
b
u
n
dle-boundary' into maint
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge bra
n
ch 'jc/maint-diff-patch-header' into
m
aint
commit
|
commitdiff
|
tree
2012-03-12
J
unio
C
Hama
n
o
Merg
e
branch 'jn/maint-do-not-match-with-unsanitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio C Ha
m
ano
M
erge
b
r
anc
h
'jc/am-3-nonstandard-
p
op
t
'
int
o
maint
commit
|
commitdiff
|
tree
2012-03-06
J
u
nio C Hamano
Merge
b
ra
n
ch 'maint-1
.
7
.
8' i
n
to maint
commit
|
commitdiff
|
tree
2012-03-06
Ju
n
i
o C Hamano
Merge branch 'maint-1
.
7
.
7'
into
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-05
J
u
ni
o
C Ha
m
ano
Git
1
.
7
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
J
unio C Hamano
Merge br
a
nc
h
'jc/doc-me
r
ge-option
s
'
into maint
commit
|
commitdiff
|
tree
2012-03-05
Juni
o
C H
a
mano
M
e
rge branch 'cn/maint-rev
-
list-doc' int
o
maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C H
a
mano
Update
d
r
aft release n
o
te
s
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 Hamano
M
e
rge branc
h
'cn/maint-branch-with-bad' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C H
a
mano
Merge bra
n
ch 'j
n
/
maint-gitweb-invalid-rege
x
p' into
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
J
un
i
o C Hamano
Merge bra
n
ch 'nd/main
t
-verify-object
s
' into maint
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io C Hamano
Mer
g
e branch
'jk/maint-
a
voi
d
-
stre
a
ming-f
i
lte
r
ed-conte
n
ts
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Mer
g
e br
a
n
c
h '
j
b/filter-
i
gnore-sigpip
e
'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2012-03-05
J
unio C H
a
m
a
no
M
e
rge branch 'sp/sm
a
rt-http
-
fail
u
re-to-push' into maint
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io
C
Ham
a
n
o
Merge bran
c
h
't
r
/main
t
-bun
d
le-l
o
ng-subject' int
o
maint
commit
|
commitdiff
|
tree
2012-03-02
Junio C H
a
mano
Docume
n
t
a
t
ion: do
n
ot a
s
s
u
m
e
that n >
1
in <re
v
>
~
$n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Junio
C
Hamano
diff
-p: squ
e
lch "diff --git" header for stat-
d
irty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Junio C
Hama
n
o
t4011: illustrate
"diff-index -p" on stat-dirty paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
J
u
nio C Hamano
t4011: modernise st
y
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Ha
m
ano
Update draft release notes
to 1
.
7
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C Hamano
M
e
rge branch 'pj/
r
emote-s
e
t-bran
c
hes-usage-fi
x
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o C Hamano
Merge
bran
c
h
'j
n
/
g
i
t
we
b
-unborn-hea
d
'
into m
a
int
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C Hamano
Merge
b
ranc
h
'jn/a
n
cient-meld-support'
into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C
H
amano
Mer
g
e bran
c
h
'
t
r
/merge
-
edi
t
-guidance' in
t
o maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hama
n
o
test: "am -3" can
a
ccept
n
on-standard -p<num>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C Ha
m
ano
Document accumulated 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
M
erge
b
r
a
nch 'jc/add-refres
h
-
unmerge
d
' i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C Hamano
Merge branch 'js/configure-libintl' into main
t
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
S
y
n
c wit
h
1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
G
it 1
.
7
.
8
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-23
Junio C
H
aman
o
Document mer
g
e
.
branchde
s
c co
n
figuration variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-23
Juni
o
C Hamano
am
-
3: allow nonstandard -p<num> option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-23
Junio C
Haman
o
G
i
t
1
.
7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-22
J
unio C Hamano
Document
a
tion/merge-options
.
txt: group "ff
"
re
l
ated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-21
Juni
o
C Hamano
Update draf
t
re
l
ease note
s
to 1
.
7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-21
Junio C Ha
m
ano
Merge branch 'cb/rece
i
ve-pack
-
keep
-
e
r
ro
r
s
' into maint
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o
C Hamano
Merge bra
n
c
h
'cb/
t
ransfer-no-progre
s
s'
int
o
maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C
H
am
a
no
M
erge
branch 'jk/git-dir-loo
k
up' into maint
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o
C
Hamano
Merge branch 'jc/diff-stat-scaler
'
into maint
commit
|
commitdiff
|
tree
2012-02-21
J
unio C Hamano
Merge bran
c
h
'zj/term-colum
n
s' in
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o C Hamano
Merge
b
ranch 'cb/maint-rev-
l
ist-ver
i
fy-obje
c
t
' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
J
u
nio C Ham
a
no
Merge bra
n
ch 'cb/maint-t5
5
41
-
make-server-po
r
t-portable
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Junio
C
Hamano
Merg
e
bran
c
h '
d
p/i18n-libch
a
rset' into ma
i
nt
commit
|
commitdiff
|
tree
2012-02-21
J
unio C Hamano
M
e
rge
bra
n
ch 'j
k
/gre
p
-bi
n
ary-attribute' into maint
commit
|
commitdiff
|
tree
2012-02-21
Juni
o
C Ha
m
ano
M
erge branch 'nd/diffstat-gramnu
m
' int
o
maint
commit
|
commitdiff
|
tree
2012-02-21
Ju
n
io C
H
aman
o
Merge
b
ranch 'nd/find
-
pack-entry-r
e
c
e
n
t
-cache
-
i
nv
a
lidati
o
n
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Juni
o
C Hamano
Merge branch 'tt
/
profile-bu
i
ld-fix' into
m
ai
n
t
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o C H
a
mano
Merge br
a
nch 'fc/zs
h
-co
m
pl
e
tion' into ma
i
nt
commit
|
commitdiff
|
tree
2012-02-20
Jun
i
o C
H
amano
U
p
date dra
f
t re
l
eas
e
n
otes
t
o
1
.
7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-17
Junio C Hamano
refres
h
_index: do
n
o
t sh
o
w unm
e
rged
path tha
t
is outsid
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-16
Juni
o
C Hama
n
o
U
p
date draft release notes to
1
.
7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-16
J
un
i
o C
H
a
mano
Merge branch
'
j
c/checkout
-
o
ut-of-unborn
'
into
m
aint
commit
|
commitdiff
|
tree
2012-02-16
Jun
i
o C Ham
a
no
Mer
g
e
bran
c
h 'jc/maint-mailmap-ou
t
p
ut' into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio
C Hama
n
o
Merge branch 'jk/p
r
ompt-
f
allbac
k
-to-t
t
y' into ma
i
nt
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Merge branch
'
j
n
/
g
i
tweb-search-utf-8' into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Haman
o
Me
r
ge branch
'
jc/maint-commit-ignore-i-t-a' i
n
to maint
commit
|
commitdiff
|
tree
2012-02-16
Junio
C
Hamano
Merge br
a
n
c
h
'
mm/empty-lo
o
se-error-
m
essage'
into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C H
a
mano
Merge branch 'nk/ct
y
p
e
-
for-per
f
'
i
nto
m
aint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Merge bra
n
ch 'jx/i18n-mor
e
-marking' into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C
Hamano
Merge
b
ranch 'rt/com
p
letion-branch-edit-des
c
' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-14
Junio C
H
a
m
ano
d
iff --stat:
s
how ba
r
s of same length for
paths
with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-14
Juni
o
C Hamano
Gi
t
1
.
7
.
9
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hamano
Merge b
r
an
c
h 'jk/maint-tag-
s
how-fix
e
s' into maint
commit
|
commitdiff
|
tree
2012-02-14
Junio C
Haman
o
Me
r
ge bran
c
h
'
bw/
i
n
e
t-
p
ton-ntop-c
o
m
p
a
t' into maint
commit
|
commitdiff
|
tree
2012-02-14
J
uni
o
C Hamano
Merg
e
branch 'mp/make-cleanse-x-for-exe' into
main
t
commit
|
commitdiff
|
tree
2012-02-14
Junio C
Hamano
Merge b
r
anch
'jn/merg
e
-n
o
-edit-fix' int
o
maint
commit
|
commitdiff
|
tree
2012-02-13
Juni
o
C Hama
n
o
Update dr
a
ft release notes to 1
.
7
.
9
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-13
Junio C Hamano
Merg
e
branch 'j
s
/
a
dd-e-submodule-
f
ix' into maint
commit
|
commitdiff
|
tree
next