repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive --renormalize
2010-08-06
J
onathan
Nieder
mer
g
e-
r
ecurs
i
ve
--
r
e
normal
i
ze
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan Nieder
rerere:
ne
v
er re
n
ormaliz
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
onat
h
an Ni
e
der
rerere: mi
g
rate t
o
pa
r
se-options API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
N
ieder
t
4200 (rerere): mode
r
nize
style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Ni
e
de
r
ll
-
merge: let
call
e
r
decide wheth
e
r to renormalize
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Niede
r
ll-merg
e
: make flag
e
a
sier to
p
opulate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
onatha
n
Nie
d
e
r
Do
c
um
e
ntation/techn
i
c
a
l
: document ll_merge
Cc: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan Niede
r
m
e
rge-trees: let call
e
r decid
e
w
h
ether t
o
renormaliz
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jon
a
than Nied
e
r
merg
e
-trees: pu
s
h choi
c
e to renormaliz
e
away from
l
ow
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
han Nie
d
e
r
t6038 (merg
e
.
re
n
orm
a
liz
e
)
: check that it can be
turned o
f
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan N
i
eder
t6038
(
merge
.
renormali
z
e): t
r
y checkout
-
m a
n
d cherry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonath
a
n Nieder
t6038 (me
r
ge
.
renormalize):
s
tyle nit
p
i
c
ks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
Eyvi
n
d Bernhardsen
Don't ex
p
and CRLFs when normalizing
te
x
t during merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind B
e
rnh
a
rdsen
Try
normalizing files
t
o a
v
oid delete/modify c
o
nflicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind Ber
n
hardsen
Avo
i
d conflicts when merging branche
s
w
ith
m
ixed normaliza
t
io
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-27
Junio C
H
amano
G
it 1
.
7
.
2
-r
c
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-27
Jun
i
o C H
a
m
ano
Merge
b
ranch
'
cp/
t
extc
o
nv-cat-file'
commit
|
commitdiff
|
tree
2010-06-27
J
unio
C
H
a
m
a
no
Me
r
ge branch 'pb/maint-perl-errmsg
-
no-dir'
commit
|
commitdiff
|
tree
2010-06-27
Junio
C Ham
a
no
Merge br
a
nch 'tr/send
-
email-8bit'
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
Merg
e
branch
'
js/ma
i
nt-a
m
-rebase-inva
l
id-au
t
hor'
commit
|
commitdiff
|
tree
2010-06-27
Ju
n
io
C
Ha
m
ano
Merge
branch
'
ab/blame-textconv'
commit
|
commitdiff
|
tree
2010-06-27
J
u
nio
C Hamano
M
e
rg
e
br
a
nch 'jn/
s
how-
n
u
m
-walks'
commit
|
commitdiff
|
tree
2010-06-25
Jun
i
o C Hamano
Merge
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-06-25
Ram
s
ay Jones
msvc: Fix som
e
compil
e
r warnings
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-25
Christ
i
an Couder
Documenta
t
ion: grep: fix asciidoc
p
r
o
ble
m
with --
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-24
Mich
a
el J Gru
b
er
git-
c
at-file
.
txt: Docu
m
e
n
t --
t
extc
o
nv
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-24
Ramsay
J
ones
msvc: Fix some "expr evaluates to function" compi
l
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-23
Junio C
H
amano
Merge br
a
n
ch 'jk
/
u
rl-dec
o
de'
commit
|
commitdiff
|
tree
2010-06-23
Junio C Hamano
url
.
c
: "<scheme
>
://"
part
at the beginning sh
o
uld not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Update draft releas
e
notes to 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-22
Jun
i
o C Ha
m
ano
Me
r
ge branch
'
jc/maint-s
i
mpler-commo
n
-
prefix'
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio
C Hamano
Me
r
ge branch 'sb/f
o
r
m
at-patch-s
i
gnature
'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'mg/pretty-magic
-
space
'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge
b
ranch '
j
n/
g
itweb-return-or-exit-clean
u
p'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge
branc
h
'bd/mai
n
t
-
u
npa
c
k-tree
s
-parawalk-fix'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'cc/cherry-pick-serie
s
'
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio
C
Ha
m
ano
Me
r
ge branch 'jc/rev-list-ance
s
try-path
'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
M
erge br
a
nch 'lt/
e
xtend
e
d-sha1-match-c
o
mmit
-
with-reg
e
xp'
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
i
o
C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-06-22
J
uni
o
C
Hamano
Updat
e
dr
a
f
t release notes
to 1
.
7
.
1
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-22
J
u
n
i
o
C Hamano
Merge bra
n
ch 'ic/maint-re
b
ase-i-abo
r
t
'
into
m
aint
commit
|
commitdiff
|
tree
2010-06-22
Junio C H
a
mano
M
e
rge branch
'
c
c
/maint-co
m
mit-reflog-msg' into
maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C
Hamano
Merge branch 'jk/maint-advice-empty-ame
n
d' in
t
o
m
aint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch '
t
c/c
o
m
mit-ab
b
rev
-
f
ix' into maint
commit
|
commitdiff
|
tree
2010-06-22
Jun
i
o C Ham
a
no
Me
r
ge branch '
j
n/document-rebas
e
-i-p-
l
imitation' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-06-22
Junio C H
a
mano
Merge branch 'j
n
/
che
c
kout-doc' into maint
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io C Haman
o
Merge branch
'
cc
/
m
aint-diff-CC-binary' into ma
i
nt
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
i
o C Hamano
Merge bra
n
ch 'j
c
/t9129-
a
ny
-
u
tf8' into maint
commit
|
commitdiff
|
tree
2010-06-22
J
u
ni
o
C Haman
o
M
erge branch '
c
b/ls-files-cd
u
p' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Ha
m
ano
M
erg
e
b
ranch 'tc/m
e
rge-m
-
log'
i
nto
m
a
int
commit
|
commitdiff
|
tree
2010-06-22
Junio
C
Hamano
Me
r
ge branch 'ph
/
clone-messag
e
-r
e
wo
r
d
'
into ma
i
nt
commit
|
commitdiff
|
tree
2010-06-22
J
unio C
H
am
a
no
M
erge branc
h
'
j
n/m
a
in
t
-ame
n
d-m
i
s
sing-name' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Ham
a
no
Merge
b
ranch 'pc
/
remove-wa
r
n' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
tests:
r
e
move unnece
s
sary '^' from 'expr'
regula
r
exp
r
ession
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Hamano
Merge br
a
n
c
h
'js/mai
n
t-r
e
c
eive-pack-s
y
m
r
e
f-alias'
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hamano
Merg
e
bran
c
h 'cc/maint-commit-reflog-msg'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Hamano
Merge branc
h
'ic/maint-r
e
base
-
i-ab
o
r
t'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
Hamano
Merge
b
r
a
n
ch 'jk/maint
-
advice-empty-amend'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
a
mano
Merge
branc
h
'eb
/
cor
e
-eol'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
M
e
r
g
e
b
ranch 'f
g
/autocrlf'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
Hamano
M
e
rge branch 'sm
/
branc
h
-broken-ref'
commit
|
commitdiff
|
tree
2010-06-21
Junio C H
a
mano
Merge branch 'rr/p
a
rse-d
a
te-refactor
'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ham
a
no
M
erge branch 'jn
/
document-rebase-i-p-l
i
mitatio
n
'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
Haman
o
Merge branch
'
t
c
/co
m
m
i
t-abbrev-fix'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ham
a
no
Merge br
a
nch
'
t
r
/
r
eceive-pack-aliased-
u
pdate-fix'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
a
mano
Merge branch 'g
s
/usa
g
e-to-stdout'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Haman
o
M
e
r
g
e br
a
nch '
j
s/async
-
thre
a
d'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
amano
Merge bra
n
ch 'gv
/
portable'
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio C
H
amano
Merge b
r
anch 'bc/portable'
commit
|
commitdiff
|
tree
2010-06-21
J
uni
o
C Hamano
Mer
g
e branch 'jn/
g
itweb-fastcgi'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch 'jn/ch
e
cko
u
t
-
doc'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merg
e
branch
'em/c
h
ecko
u
t-orphan'
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio C Hamano
Drop items
th
a
t are 1
.
7
.
1
.
1
fi
x
e
s
from the
1
.
7
.
1 releas
e
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hamano
U
p
d
ate draft release notes to 1
.
7
.
1
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch '
m
c/maint-z
o
neparse' into maint
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o
C
Ha
m
ano
M
e
rge bran
c
h 'jk/dif
f
-m-do
c
' into mai
n
t
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Mer
g
e
b
r
a
nch
'jn/maint-do
c
-
ignore'
into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
H
amano
M
e
rge b
r
anch 'bs/user
d
iff-
p
hp' int
o
maint
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio C Ha
m
a
n
o
Merge branch 'jk/
m
a
i
nt-s
h
a1
-
f
ile-name-
f
ix'
int
o
maint
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
Hamano
Merge branch 'jk/maint-pu
l
l-dry-r
u
n
-noop'
i
nto maint
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C
H
a
m
a
n
o
Merg
e
b
r
anch 'bw/diff-metainfo-color' into ma
i
nt
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C Hamano
Merge branch
'cb
/
assume-unchanged-fi
x
'
into
m
aint
commit
|
commitdiff
|
tree
2010-06-21
J
u
n
i
o C Haman
o
M
e
rge branch 'jn
/
notes-doc' into
main
t
commit
|
commitdiff
|
tree
2010-06-21
J
u
n
io C
Hamano
M
erge branch 'ab/test-cl
e
anup
'
i
nto maint
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hamano
Merge branch 'rs/diff-no-m
i
n
imal' into maint
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C Hamano
Me
r
ge branc
h
'
b
g/apply-blank
-
trailing-context'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
J
u
n
i
o
C
Hama
n
o
M
e
rge
br
a
nch
'
m
a
i
n
t
'
commit
|
commitdiff
|
tree
2010-06-21
Ævar Arnfjörð Bjar
m
ason
g
i
t-cvsserv
e
r: fix erro
r
for invalid password f
o
rm
a
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-21
Ævar Arnfjörð Bjarmason
git-cvsserver: typo in
a
c
o
m
ment: bas -> h
a
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-20
J
ay Soffian
g
i
tweb/Makefi
l
e: fix ty
p
o in
g
itweb
.
min
.
css rul
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Clé
m
ent
P
oulain
t
/
t
8007: test t
e
xtconv sup
p
ort for
cat-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Cl
é
me
n
t
Po
u
lain
textconv: support fo
r
ca
t
_file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Update draft
r
elease notes t
o
1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Mer
g
e
b
r
anch
'
cc
/
maint-diff-CC-b
i
nary'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Ham
a
no
Merge branch
'
by/diff-graph'
commit
|
commitdiff
|
tree
2010-06-18
J
unio C
H
ama
n
o
Merge b
r
anch 'c
b
/ls
-
fi
l
es-c
d
up'
commit
|
commitdiff
|
tree
2010-06-18
J
u
nio
C
Ham
a
no
M
e
r
ge branch
'jc/t912
9
-
a
n
y-utf8'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Merge branc
h
'r
r
/am-
h
e
l
p'
commit
|
commitdiff
|
tree
2010-06-18
Junio C
Hamano
Merge
b
ranch 'jn/reba
s
e-cmdlin
e
-fix'
commit
|
commitdiff
|
tree
next