repo.or.cz
/
git
/
mjg.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 inab
i
lity to
m
erge binar
y
fil
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-09
Ju
n
io
C
Hamano
attr:
"
binary" attri
b
ute should c
h
oose buil
t
-in "b
i
nary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-09
Ju
n
io C Hamano
mer
g
e: teac
h
-Xours/-Xt
h
eir
s
to bi
n
ary ll-merg
e
driv
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Ha
m
an
o
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
unio
C
Ham
a
n
o
Sync with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ha
m
ano
Gi
t
1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ham
a
no
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 Hamano
Merge br
a
nch
'maint-1
.
7
.
8' into
m
aint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ham
a
no
Mer
g
e
b
ranch 'jc/mai
n
t
-verify-obj
e
cts-remove-pessimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C Hama
n
o
Mer
g
e br
a
nch '
d
w/gitweb-doc-grammo'
into ma
i
nt-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Jun
i
o C Hamano
Merge branch 'tr/c
a
che-
t
r
e
e
' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C
Haman
o
Merge branch 'cb/maint-t
5
541-make-server-p
o
rt-po
r
t
able
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio
C Hama
n
o
Mer
g
e branch
'
c
n/maint
-
rev
-
list-doc' i
n
to maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C H
a
mano
Merge
b
r
a
nch 'tr/maint-
b
undle
-
b
oundary' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C Haman
o
Merge branch 'tr/maint-bundle-long-subject' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio C Ha
m
ano
Mer
g
e branc
h
'ph/rerere-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Jun
i
o C Hamano
Git 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Jun
i
o
C Ha
m
ano
Merge br
a
n
ch 'jc/maint-merge-
a
utoedit'
i
n
to maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C Ham
a
no
G
i
t
1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
io C
H
amano
Mer
g
e branch
'
jn/maint-fast-import-em
p
ty-ls' into maint
commit
|
commitdiff
|
tree
2012-03-26
Juni
o
C Hamano
Me
r
ge branc
h
'ph/re
r
e
re-doc
'
into m
a
in
t
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Mer
g
e
b
ranch 'm
s
/ma
i
nt-config-error-at-e
o
l-
l
ine
c
ount
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Juni
o
C Hama
n
o
Mer
g
e b
r
anch 'maint-1
.
7
.
8' into main
t
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C Hamano
merge: ba
c
kport GIT_MERGE_AU
T
OE
D
I
T support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Jun
i
o C
H
amano
Merge b
r
anch 'ks/sort
-
wildcard-in-makefile' into ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Juni
o
C Hamano
Merge
branch 'jc/a
d
vi
s
e-i18n' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio C Ha
m
ano
Merge branch 'jn/gitweb-unsp
e
cified-action' in
t
o mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
J
u
n
i
o C
H
a
m
ano
f
etch/rece
i
ve: remove over-
p
essim
i
stic conne
c
tivity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Jun
i
o C Hamano
G
it 1
.
7
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C
Hama
n
o
M
e
rge bra
n
ch 'tr/
m
aint
-
bundl
e
-boundary' into maint
commit
|
commitdiff
|
tree
2012-03-12
J
u
n
i
o
C Hamano
M
e
rge br
a
nch
'jc/maint-diff-pa
t
c
h
-hea
d
e
r' into ma
i
n
t
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Junio C H
a
man
o
Merge branch 'jn/
m
aint-do-not-match-wit
h
-
u
nsa
n
itized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Juni
o
C Hamano
Merge bra
n
ch 'jc/am-3-n
o
nstandard
-
po
p
t' into maint
commit
|
commitdiff
|
tree
2012-03-06
Ju
n
io C Hama
n
o
Merge branch 'maint-1
.
7
.
8' into
maint
commit
|
commitdiff
|
tree
2012-03-06
J
u
nio C Hamano
Merge br
a
n
ch 'maint-1
.
7
.
7' into
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-05
Junio
C Hamano
Git 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o C Haman
o
Merge
b
r
anch
'
j
c/doc-merge-op
t
ions' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Mer
g
e
b
r
anch
'
cn/maint-re
v
-
l
ist-doc' int
o
maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C H
a
mano
Up
d
a
te draft r
e
lease
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
Junio C Hamano
Merge branch 'c
n
/ma
i
nt-branch-wit
h
-
bad' into
maint
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o C Hamano
Mer
g
e branch
'
jn/maint-gitweb-invalid-reg
e
xp' into
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io C
H
amano
Merge branch 'nd/maint-verify-objects' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge br
a
nch 'jk/maint-
a
void-streaming-filtered-contents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io C
H
am
a
no
Merge branch 'jb/filter
-
igno
r
e-sigpipe
'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io C H
a
mano
Merge bra
n
ch 'sp/
s
m
a
r
t-h
t
tp-f
a
ilur
e
-t
o
-pus
h
'
into maint
commit
|
commitdiff
|
tree
2012-03-05
Juni
o
C Hamano
Merge branch 'tr/maint-bu
n
dle-lo
n
g
-
sub
j
ect
'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2012-03-02
Junio C Hamano
Documen
t
ation: do not assume that n > 1 in <r
e
v>~$n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Ham
a
no
diff -p: s
q
uelch "d
i
f
f
-
-git" header for s
t
at-di
r
ty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio
C Hamano
t401
1
: illustrate "
d
iff-inde
x
-p"
o
n
stat-
d
ir
t
y path
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Haman
o
t401
1
: modernise st
y
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio
C
H
aman
o
Update dra
f
t
releas
e
notes to 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge branch 'pj/remote-set-branches
-
usage-f
i
x' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge branch 'j
n
/gitweb
-
unb
o
rn-head' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Ha
m
ano
Merge bran
c
h
'
j
n/an
c
ien
t
-meld-
s
up
p
ort' in
t
o maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Mer
g
e branch '
t
r/merge-edit-guida
n
ce'
i
n
t
o maint
commit
|
commitdiff
|
tree
2012-02-27
Juni
o
C
Ha
m
ano
tes
t
:
"am -3" can accept non-sta
n
dar
d
-p<num>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Document a
c
cumulated f
i
xes
s
ince 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
i
o C Haman
o
M
erge branch 'j
c
/ad
d
-refresh-
u
nmerge
d
' into main
t
commit
|
commitdiff
|
tree
2012-02-27
Juni
o
C H
a
mano
M
e
rge
branch
'js/configure-li
b
intl' into main
t
commit
|
commitdiff
|
tree
2012-02-27
Juni
o
C Hamano
Sy
n
c wi
t
h
1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Junio C Ha
m
a
n
o
G
i
t 1
.
7
.
8
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Junio C Haman
o
Document merge
.
bran
c
hd
e
sc configu
r
ation variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
J
unio C Hamano
am -3: allow nonstanda
r
d -p
<
n
u
m> option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Junio C
H
a
mano
Git
1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-22
Ju
n
i
o
C Hama
n
o
Do
c
um
e
ntation/merge-options
.
t
x
t:
g
roup "ff" related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-21
Junio C Ham
a
no
Update draf
t
r
e
lease notes to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-21
Junio
C
Hamano
Merge
b
r
a
nc
h
'cb/receive-
p
ack-
k
eep-error
s
' into m
a
int
commit
|
commitdiff
|
tree
2012-02-21
Junio C H
a
ma
n
o
Merge bran
c
h
'cb/transfer-no-progress' into m
a
i
n
t
commit
|
commitdiff
|
tree
2012-02-21
Junio
C
Ham
a
no
Merge branch
'
jk/git-
d
ir-lo
o
kup' into
maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
M
e
rge branch 'jc/diff-stat-
s
caler' i
n
to maint
commit
|
commitdiff
|
tree
2012-02-21
J
u
nio C H
a
mano
M
erge bra
n
ch
'
zj/term-columns' int
o
mai
n
t
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge
b
ranch 'cb/
m
ai
n
t-r
e
v-l
i
st-ve
r
ify-object
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Junio
C
Hamano
Merge bra
n
ch 'cb/maint-t5541-make-server-port
-
portable
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Ju
n
io
C
Hamano
Merge branch 'dp/i18n
-
libcharset' int
o
maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Ha
m
ano
M
e
rge bran
c
h '
j
k/grep-bi
n
ary-at
t
ribu
t
e
'
i
nto
m
a
i
nt
commit
|
commitdiff
|
tree
2012-02-21
Junio C Ham
a
no
Mer
g
e
branch 'nd/diffstat-gram
n
um' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge branch 'nd/find-pack-entry-recen
t
-
c
ac
h
e
-inv
a
lidati
o
n
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge branc
h
'tt/profile-build-fi
x
' int
o
maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge branch 'fc/zsh-completion' into maint
commit
|
commitdiff
|
tree
2012-02-20
Junio C Hama
n
o
Update draft release no
t
e
s to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-17
Junio C Hamano
refresh_ind
e
x: do not show unmer
g
ed path that
i
s outsi
d
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Update dra
f
t release
no
t
es to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-16
Junio
C
Hama
n
o
Merge bra
n
c
h 'jc
/
ch
e
ckout-out-
o
f-un
b
orn' into
m
aint
commit
|
commitdiff
|
tree
2012-02-16
J
unio C Hamano
M
erge b
r
anc
h
'jc/maint-mailmap-output'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Merge branch 'jk/p
r
ompt-fallbac
k
-to
-
tt
y
'
into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C
H
amano
Merge branc
h
'jn/gitweb-search-utf-8
'
i
n
to maint
commit
|
commitdiff
|
tree
2012-02-16
Ju
n
io
C Hamano
Merge branch
'
j
c
/maint-commit-ign
o
re
-
i-
t
-a' into maint
commit
|
commitdiff
|
tree
2012-02-16
Ju
n
io C Ha
m
a
no
M
e
rge branch 'm
m
/empty-loose
-
error-message' int
o
mai
n
t
commit
|
commitdiff
|
tree
2012-02-16
Junio
C
Hamano
Merge br
a
nch 'nk/ctype-f
o
r-p
e
rf' into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Merge branch
'jx/i18n-m
o
r
e
-marking' into maint
commit
|
commitdiff
|
tree
2012-02-16
J
unio C Hamano
Merge bra
n
ch 'rt/complet
i
on-branch-edit-desc' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-02-14
Junio C Ha
m
an
o
diff --stat: sho
w
bars of same lengt
h
for paths with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-14
J
u
nio C Haman
o
Git
1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-14
Junio
C Ham
a
n
o
M
erge bran
c
h 'jk/m
a
int-tag-show-fixes
'
into maint
commit
|
commitdiff
|
tree
2012-02-14
J
u
n
io
C
H
ama
n
o
Merg
e
branch 'bw/
i
n
e
t-
p
ton-nto
p
-
compat' into mai
n
t
commit
|
commitdiff
|
tree
2012-02-14
Junio
C
H
amano
M
erge
b
ranch 'm
p
/mak
e
-cleanse-x-for-e
x
e' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2012-02-14
Jun
i
o C H
a
man
o
Merge
b
r
anch '
j
n
/merge-
n
o-edit-
f
ix' into m
a
int
commit
|
commitdiff
|
tree
2012-02-13
Junio
C
Hamano
Update draft relea
s
e
notes
t
o 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-13
J
u
nio
C
H
amano
Mer
g
e branch 'js/add-e-su
b
module-fix'
i
n
t
o
maint
commit
|
commitdiff
|
tree
next