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
merge-trees: push choice to renormalize away from low level
2010-08-06
Jo
n
at
h
an Nieder
merge-tre
e
s: push choi
c
e to re
n
ormalize a
w
ay from low
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
ha
n
Nieder
t603
8
(merge
.
renorm
a
lize): check that
i
t can
be turned off
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
N
ieder
t6038 (merge
.
reno
r
m
a
lize):
tr
y
c
h
eckout -m and cherry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
han Ni
e
der
t6038 (merge
.
r
en
o
r
m
ali
z
e): s
t
y
le nitpicks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind B
e
r
n
hardsen
Don't
e
xpa
n
d
C
R
L
Fs when no
r
mal
i
zing text during mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind Bernh
a
r
dsen
Try norma
l
izing
f
iles to avoid
dele
t
e
/
modi
f
y co
n
flicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind Bernhard
s
en
A
v
o
i
d conf
l
i
cts whe
n
me
r
ging branches with m
i
xed
normaliz
a
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hama
n
o
Git 1
.
7
.
2-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
Merge branch
'
cp/textconv-cat
-
file'
commit
|
commitdiff
|
tree
2010-06-27
Jun
i
o C Hamano
Me
r
ge b
r
anch 'pb
/
maint-perl
-
e
rr
m
sg-no-
d
ir'
commit
|
commitdiff
|
tree
2010-06-27
Ju
n
io C
Hamano
Merge branch 'tr/
s
end-email-8bit'
commit
|
commitdiff
|
tree
2010-06-27
Junio C
H
amano
Me
r
ge br
a
nch 'js/maint-am
-
rebase-invalid-author'
commit
|
commitdiff
|
tree
2010-06-27
Jun
i
o C Hamano
Merge branch 'ab
/
blame-textconv'
commit
|
commitdiff
|
tree
2010-06-27
Junio C H
a
mano
Merge
b
ran
c
h '
j
n/show-
n
u
m-walks
'
commit
|
commitdiff
|
tree
2010-06-25
Ju
n
io
C
Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-06-25
R
a
msay
J
ones
msvc:
F
ix some
com
p
iler warning
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-25
Christian Coud
e
r
Documentation: grep: fix
asci
i
do
c
p
ro
b
lem wit
h
--
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-24
Michae
l
J
Gru
b
er
git-ca
t
-
file
.
txt: Document -
-
t
extconv
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-24
Ramsay Jone
s
msvc: Fix some "expr evalu
a
tes t
o
f
un
c
t
ion" compi
l
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-23
Junio C Hamano
Me
r
ge branch 'jk/url-decode'
commit
|
commitdiff
|
tree
2010-06-23
Junio C Hamano
url
.
c
:
"<scheme>:/
/
" part at the beginning should
n
ot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C Hama
n
o
Update draft re
l
ease notes t
o
1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io C Hamano
Merge branch
'jc/maint-simpler-
c
o
m
m
o
n
-
prefix'
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io
C
Hamano
Mer
g
e branch 'sb/
f
ormat-patch-sig
n
ature'
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio C Hamano
Mer
g
e b
r
anch 'mg/pretty
-
magi
c
-space'
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio C Ham
a
n
o
Merg
e
branch 'jn/gitweb
-
return-o
r
-
e
xit-clean
u
p'
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio C Hamano
Merge branch 'bd/maint-unpack
-
trees-parawalk-fix'
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C Ha
m
ano
Merge
bra
n
ch 'c
c
/ch
e
rry-pic
k
-series'
commit
|
commitdiff
|
tree
2010-06-22
Junio
C
H
a
m
ano
Merge bra
n
ch 'jc/rev-list-ancestry-pat
h
'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge
branc
h
'lt
/
extended-sha1-ma
t
ch-com
m
it-wi
t
h-rege
x
p'
commit
|
commitdiff
|
tree
2010-06-22
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C
H
a
m
a
no
Update
d
raft release
n
otes to 1
.
7
.
1
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'ic/
m
ai
n
t
-
re
b
as
e
-i
-
a
bort' into ma
i
nt
commit
|
commitdiff
|
tree
2010-06-22
Junio
C
Ha
m
a
no
Merge branch 'cc/
m
ai
n
t
-commit-reflog-m
s
g
'
into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C
Hamano
Merge branch 'jk/maint-
a
d
vice-empty-
a
mend' int
o
m
ain
t
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
M
erge
b
ran
c
h 'tc/commit
-
abbrev-fix' int
o
m
aint
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C Hama
n
o
Merge branch 'jn/document-reb
a
se-i-p-limitation' into
.
.
.
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
M
e
rge
branch 'jn/checko
u
t-doc
'
into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C H
a
mano
Merg
e
branch 'cc/m
a
int-
d
i
f
f-C
C
-binar
y
' into
maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Ham
a
no
Merge branch 'jc/
t
9129-any-ut
f
8' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C
H
amano
Merge branch 'cb/ls-files-cdup' in
t
o maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merg
e
branch 'tc/merge
-
m-log' into ma
i
n
t
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io C Hamano
Merge branch '
p
h
/
clone-m
e
s
s
age
-
rewor
d
'
int
o
m
a
int
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io C Hama
n
o
Merg
e
b
r
anch 'jn/main
t
-amend-mi
s
sing-n
a
me' into
m
a
int
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merg
e
branch 'pc/remove
-
warn' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
t
e
s
ts
:
remove unnece
s
sary
'^' from 'e
x
pr' r
e
gul
a
r
expressi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
am
a
n
o
Merge branch
'js/maint
-
receive-pack-symr
e
f-ali
a
s
'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Hamano
M
e
r
ge bra
n
ch
'
cc/main
t
-commit-ref
l
o
g
-msg
'
commit
|
commitdiff
|
tree
2010-06-21
J
u
n
i
o
C Hama
n
o
Merge br
a
nch
'
ic/maint-reba
s
e-i-a
b
ort'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Hama
n
o
Merge branch
'
j
k/
m
aint-advice-empty-
a
mend'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge bran
c
h 'eb/core-eol'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hama
n
o
M
erge branch 'fg/au
t
ocr
l
f'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ham
a
n
o
Mer
g
e
b
r
a
nch 's
m
/bra
n
c
h-
b
roken
-
ref'
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C Hamano
Merge
b
ranc
h
'rr/parse-date-refactor
'
commit
|
commitdiff
|
tree
2010-06-21
J
uni
o
C
H
ama
n
o
M
e
rge branch 'jn/document-reba
s
e-i
-
p-limitati
o
n'
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C Haman
o
Merge branch
'
tc/com
m
i
t-abbrev
-
fix'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ham
a
no
Merge bra
n
ch
'
tr/
r
ece
i
ve-pack
-
a
l
ia
s
e
d-upda
t
e-fix'
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C H
a
mano
M
erge branch 'gs/usage-to
-
s
t
d
out'
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio
C
Hama
n
o
Mer
g
e branch 'js
/
asyn
c
-thread'
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o
C Hamano
M
erge branch 'gv/portable'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Haman
o
Merge bran
c
h 'bc/portable'
commit
|
commitdiff
|
tree
2010-06-21
J
u
n
io C Ha
m
an
o
Merge
b
r
a
nch
'
j
n/gitweb-fastcgi'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
a
mano
Merge
b
ran
c
h 'jn/chec
k
out-doc'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Me
r
ge branch 'em/check
o
ut-orphan'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Drop
i
t
ems that are
1
.
7
.
1
.
1
fi
x
es from the 1
.
7
.
1 release
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C Ha
m
ano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io
C Hamano
Upda
t
e dra
f
t r
e
lease notes
t
o
1
.
7
.
1
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o
C Haman
o
Merge branch
'
mc/m
a
int-z
o
neparse' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
Hama
n
o
Merge
b
ran
c
h 'jk/
d
iff-
m
-doc' int
o
maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge
bran
c
h 'jn/maint-doc-ignore' into
m
ain
t
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Ha
m
a
n
o
Merge br
a
nch '
b
s/use
r
d
iff-php' in
t
o maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge bran
c
h 'jk/maint-sha1-file-name-fi
x
' int
o
ma
i
n
t
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io C Hamano
Merge branch 'j
k
/maint-pull-dry-run-noop' into ma
i
nt
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio
C Ha
m
ano
Merge br
a
nch
'bw/diff-metainfo
-
colo
r
'
into maint
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio C Hamano
Merge branch 'cb/assume-unchanged-fi
x
' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
Hamano
Merge branch 'jn
/
n
otes-doc' into
m
aint
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
amano
Merge branch 'ab/test-cleanup' into maint
commit
|
commitdiff
|
tree
2010-06-21
J
unio
C
Hamano
Mer
g
e branc
h
'rs/diff
-
no-minimal' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ha
m
ano
Merge
b
ranch 'bg/a
p
p
l
y-blank-trailing-
c
o
nt
e
xt' into
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C Hamano
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-06-21
Ævar Arnfjörð Bjarm
a
son
g
i
t
-cvsserver: fix e
r
ror for invali
d
pass
w
ord formats
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-21
Ævar Ar
n
fjörð Bj
a
r
mason
git-cvs
s
erve
r
: typo in a comm
e
nt: bas
-
> has
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-20
J
ay So
f
fian
git
w
eb/Ma
k
e
fi
l
e: fix
typo
i
n gitweb
.
min
.
cs
s
rule
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Clément Poulain
t/t8007:
t
est
t
extconv support
f
or cat-
f
ile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Clément
P
oulain
textcon
v
:
su
p
port for
c
at
_
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Update
draft relea
s
e notes to 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Junio C Haman
o
Me
r
ge branch 'cc
/
mai
n
t-diff-CC-bin
a
ry'
commit
|
commitdiff
|
tree
2010-06-18
Junio
C
Hamano
M
erg
e
br
a
nch 'by/diff-graph'
commit
|
commitdiff
|
tree
2010-06-18
J
u
nio
C
H
amano
Mer
g
e branch 'cb/ls-files-c
d
up'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Haman
o
Merge
b
ra
n
ch 'jc/t9129-a
n
y-utf8
'
commit
|
commitdiff
|
tree
2010-06-18
Junio C
H
amano
M
erge b
r
anch '
r
r
/
am-help'
commit
|
commitdiff
|
tree
2010-06-18
Ju
n
io
C
H
amano
M
erge branch 'jn/rebase-cmdline-fix'
commit
|
commitdiff
|
tree
2010-06-18
Junio
C
Hamano
M
e
rge branch
'
ps/gitw
e
b--browse-chrome
'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Merge branch 'j
k
/am-s
k
i
p
-hint'
commit
|
commitdiff
|
tree
2010-06-18
Junio
C
Hamano
Merge branch 'jh
/
diff-index-line-a
b
brev'
commit
|
commitdiff
|
tree
2010-06-18
J
u
ni
o
C Hamano
Merge branch 'ab/maint-p
e
rl
-
use-in
s
tlibdir'
commit
|
commitdiff
|
tree
2010-06-18
Junio C
Hamano
Mer
g
e
b
ranch 'e
c
/
diff-n
o
pre
f
ix-co
n
fig
'
commit
|
commitdiff
|
tree
2010-06-18
Ju
n
i
o
C Hamano
Merge bran
c
h 'mg/
s
tatus
-
b
'
commit
|
commitdiff
|
tree
2010-06-18
J
unio C Hamano
M
e
rge bran
c
h 'j
n
/gitweb-p
l
a
c
k
u
p'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
M
e
rge br
a
n
c
h
'jk/u
r
l-de
c
o
de'
commit
|
commitdiff
|
tree
next