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 Hamano
ll-merge: warn about inability to mer
g
e bi
n
ary files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-09
Junio C Hamano
a
ttr: "binary" attribute sho
u
ld ch
o
o
s
e
b
u
i
lt-in "bina
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-09
Junio C Haman
o
merge: t
e
ach -Xours/-Xtheirs to
b
inary ll-merge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
amano
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C
H
amano
S
y
nc wi
t
h 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o
C
Ha
m
ano
Git 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o
C
H
a
man
o
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
Juni
o
C Hama
n
o
Merg
e
branch
'mai
n
t-1
.
7
.
8' into m
a
int
-
1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
M
erge branch
'jc/maint-verify-obje
c
ts-
r
emov
e
-pessimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C
H
amano
Merge b
r
an
c
h 'd
w
/git
w
eb-doc-gram
m
o' into mai
n
t
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C H
a
mano
Merge branch
'tr/cach
e
-tree' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Jun
i
o C Hamano
Mer
g
e
b
ran
c
h 'c
b
/
ma
i
nt
-
t
5541-make-
s
erver-port-portable
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Hamano
Merge branch 'cn/main
t
-rev
-
l
i
st-do
c
' in
t
o maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch 'tr/maint-bundle-
b
o
undary' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch '
t
r/maint-
b
u
ndle-long-subject' into m
a
in
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
H
a
m
a
no
Merg
e
b
r
anch 'ph/rerere-d
o
c' int
o
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
J
u
nio C Hamano
Mer
g
e branch
'
jc/mai
n
t-merge-autoedit
'
into
m
ain
t
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
Junio C Ha
m
ano
Merge branch 'j
n
/m
a
int-fast-import-e
m
pty-ls'
into maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C Ham
a
no
Merge branch
'
ph/r
e
re
r
e-do
c
' into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hama
n
o
Merg
e
bra
n
ch 'ms/m
a
int-
c
o
nf
i
g
-
e
rror-at-eol
-
li
n
ecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C
H
amano
Merge branch
'maint-1
.
7
.
8
' into maint
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
merge: ba
c
kport GIT_MERGE_AUTOEDIT suppor
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio C Hamano
Me
r
g
e
branc
h
'
k
s/sort-wildcard
-
in-makefile' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C H
a
m
a
no
Merge bran
c
h
'jc/ad
v
ise-i18n' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio
C
H
amano
Merge branc
h
'jn/gitweb-unspecified-action
'
into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Junio C Hamano
fetch/re
c
eiv
e
: rem
o
ve o
v
er-pe
s
simi
s
ti
c
connectivit
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
J
unio C H
a
man
o
Gi
t
1
.
7
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Juni
o
C Hamano
M
e
rge branch 'tr/mai
n
t-bund
l
e-
b
ounda
r
y
'
i
nto
maint
commit
|
commitdiff
|
tree
2012-03-12
Junio C
H
amano
Merge branch 'jc/mai
n
t
-d
i
f
f
-patch-header' into maint
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Jun
i
o C H
a
ma
n
o
Merg
e
br
a
nch
'
j
n
/ma
i
n
t
-do-not-m
a
tch-with-unsanitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Ju
n
io C Hamano
Merge branch 'jc/am-3-nonstandar
d
-p
o
pt' in
t
o maint
commit
|
commitdiff
|
tree
2012-03-06
J
u
nio C
Hamano
Merge
b
ranch 'ma
i
nt-1
.
7
.
8
'
into maint
commit
|
commitdiff
|
tree
2012-03-06
Junio C Ha
m
ano
Merge branch 'ma
i
nt-1
.
7
.
7' into main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
H
amano
Git 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C
Ham
a
n
o
Merge branch 'jc/d
o
c-
m
e
r
g
e
-
op
t
ions' into m
a
int
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
M
erge b
r
an
c
h '
c
n/
m
aint-r
e
v
-
l
ist-doc' int
o
maint
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio C Hamano
Update draft relea
s
e not
e
s to 1
.
7
.
9
.
3 for t
h
e l
a
st
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Ha
m
an
o
Merg
e
branch 'cn/maint-bran
c
h-with-bad' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
Hamano
Merge branc
h
'jn/m
a
int
-
gitweb-
i
nvalid-regexp
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
M
erge branch
'nd/maint-verify
-
objects
'
into mai
n
t
commit
|
commitdiff
|
tree
2012-03-05
Junio C Ha
m
ano
Merge bra
n
ch 'jk/
m
a
i
n
t
-a
v
oid-streaming-filtered-contents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio C Ham
a
no
Merge branch 'jb/fi
l
t
e
r
-ign
o
re-sigpipe'
i
nto maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge branch 's
p
/sm
a
rt-
h
ttp-
f
ailure-to-push
'
into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Ha
m
ano
M
e
rge branch 'tr
/
maint-b
u
ndle
-
lo
n
g-subj
e
ct' into maint
commit
|
commitdiff
|
tree
2012-03-02
Junio C Hamano
Docu
m
entation
:
do not assume tha
t
n > 1
in <rev>~$n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Ham
a
no
d
i
ff -p
:
sq
u
e
l
ch
"diff --git" header for stat-dirt
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Jun
i
o C
Hamano
t4011:
i
llustrate "diff-i
n
dex -p" on
s
tat-dirty path
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Juni
o
C
H
amano
t
4
011:
moder
n
i
se style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio
C Ha
m
a
no
Update draft
release notes to 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
J
u
n
io C Hamano
Merge branch '
p
j/remote
-
set-br
a
nches-usage-fix' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
J
unio C Hamano
Merge bran
c
h 'jn
/
gitweb-unborn-head
'
into maint
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C Hamano
M
e
rge br
a
nch 'jn/ancient-
m
eld
-
s
upport' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio
C
Hamano
Merge
branch 'tr/merg
e
-edit-guidance'
i
n
to maint
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C Hamano
test: "am
-3
"
can accept non-standard -
p
<num>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hama
n
o
D
o
cume
n
t acc
u
mulated 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
H
a
m
ano
M
e
rge br
a
nch 'j
c
/add-r
e
fr
e
s
h
-unmerge
d
' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C
Hamano
Merge
b
ranc
h
'js/configure-libint
l
'
into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio
C
Hamano
Sync wi
t
h 1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
J
unio C Hamano
Gi
t
1
.
7
.
8
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Junio
C
H
amano
Docu
m
e
n
t merge
.
branchdesc
c
o
n
figu
r
ation va
r
ia
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
J
u
nio C H
a
mano
am -3: allow nonsta
n
dard -p<num> option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Junio C
Hamano
G
i
t 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-22
Junio C
H
aman
o
D
o
cu
m
en
t
ation
/
me
r
ge-op
t
io
n
s
.
t
xt: group "ff" related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-21
Junio
C
Hamano
Update dr
a
ft relea
s
e
notes to
1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-21
Ju
n
io C Hamano
Merge
b
ranch '
c
b/receive-pack-keep
-
er
r
ors'
into mai
n
t
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge branch 'cb/
t
ransfe
r
-no-progress' into maint
commit
|
commitdiff
|
tree
2012-02-21
Ju
n
io
C Hamano
Merge branc
h
'jk/
g
i
t
-
d
ir-lookup'
i
nto maint
commit
|
commitdiff
|
tree
2012-02-21
J
u
nio C Ha
m
ano
M
erge
b
ranch
'jc/diff-stat-scaler
'
i
nto m
a
int
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o C
H
a
mano
Merge b
r
anch 'zj/term-columns'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2012-02-21
Junio C
Ha
m
ano
Merge branch 'cb/m
a
int
-
rev-list-verif
y
-object' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge b
r
anch 'cb/mai
n
t-t5541
-
m
ak
e
-ser
v
er-port-portable
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
J
unio C Ha
m
a
n
o
Merge br
a
nch 'dp/i18n
-
libchar
s
et'
i
n
t
o maint
commit
|
commitdiff
|
tree
2012-02-21
Ju
n
io C Hamano
Merge branc
h
'
jk/grep
-
b
inary-att
r
ibute' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Haman
o
Merge branch 'nd/diffstat
-
gramnum' into maint
commit
|
commitdiff
|
tree
2012-02-21
Ju
n
io C
H
amano
Merge branch 'nd/find-pack-entry-r
e
cent-cache
-
inv
a
lidation
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Junio C
Hama
n
o
Merge b
r
anc
h
'tt/profile
-
build-
f
ix
'
i
nto maint
commit
|
commitdiff
|
tree
2012-02-21
Junio
C Hamano
Merg
e
bran
c
h 'fc
/
z
sh-completi
o
n'
i
nto
maint
commit
|
commitdiff
|
tree
2012-02-20
Ju
n
io C Haman
o
Update
d
r
a
f
t
release
note
s
to
1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-17
J
u
n
io C Hamano
refresh_index: do not
s
how unmerged path t
h
at is outside
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-16
Ju
n
io C Hamano
Updat
e
draft release
n
o
tes to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
M
erge branch 'jc/checkout-ou
t
-
o
f-unborn' in
t
o
maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hama
n
o
Merg
e
branch 'j
c
/maint-mailmap-output' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hama
n
o
Merge bra
n
ch 'jk/
p
r
o
mpt-fallback-to-tty' into maint
commit
|
commitdiff
|
tree
2012-02-16
Juni
o
C
Haman
o
Me
r
ge branc
h
'jn/git
w
e
b-search-u
t
f-8' i
n
to maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C
H
amano
Merge
bra
n
ch 'jc/maint-co
m
mit-ignore
-
i-t-a'
i
nto maint
commit
|
commitdiff
|
tree
2012-02-16
Jun
i
o C Ham
a
no
Merge bra
n
ch '
m
m
/empty-loose-erro
r
-mes
s
age' into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio
C Hamano
Merge branch 'nk/ctype-for-perf' int
o
maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Merge branch 'jx/i18n-more-markin
g
' into ma
i
nt
commit
|
commitdiff
|
tree
2012-02-16
J
unio C Hamano
Merg
e
branch 'rt/completion-branch-
e
dit
-
desc' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-14
Junio C Ha
m
ano
d
iff -
-
stat
:
show bars of
sa
m
e
l
ength for paths wit
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-14
J
u
n
io C Hamano
Git 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-14
Jun
i
o C Hamano
Merg
e
branc
h
'
jk
/
maint-tag-show-f
i
xe
s
' i
n
to maint
commit
|
commitdiff
|
tree
2012-02-14
Ju
n
i
o C Hamano
Merge
b
r
anch 'bw/inet-pton-ntop-com
p
at' into maint
commit
|
commitdiff
|
tree
2012-02-14
Jun
i
o
C Hamano
Merg
e
bra
n
ch 'm
p
/make-cl
e
anse-x-for-exe' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2012-02-14
J
u
n
i
o C Hama
n
o
Merge
b
r
anch 'jn/
m
erge-no-edit-fi
x
'
in
t
o maint
commit
|
commitdiff
|
tree
2012-02-13
J
unio C Ham
a
n
o
Update draft release notes to 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-13
J
u
nio
C
Hama
n
o
Mer
g
e branch '
j
s/add-e-sub
m
odule-fix' into
maint
commit
|
commitdiff
|
tree
next