repo.or.cz
/
git.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
o
nathan
N
ieder
merge-recursive
--renormalize
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan N
i
e
der
rerere: neve
r
renorm
a
lize
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
N
iede
r
rerere: migra
t
e to parse-
o
pt
i
on
s
AP
I
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
t4200 (r
e
rere): modernize styl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan Nieder
l
l-merge: l
e
t caller
d
eci
d
e whether 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
Jo
n
athan N
i
eder
ll
-
mer
g
e: make flag ea
s
ier to pop
u
late
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
Docum
e
ntation
/
technical:
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
Jonathan Nieder
merge-trees: let call
e
r
d
ec
i
de whether to renormalize
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
han
Nieder
merge-tree
s
: pu
s
h choice to r
e
normalize aw
a
y f
r
om low
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
n
a
than Nieder
t6038 (merge
.
reno
r
mali
z
e): check that it can be turn
e
d off
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Ni
e
der
t6038
(mer
g
e
.
renormalize): try checkout -m
and cherry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan Nieder
t6038
(
merge
.
renorma
l
ize
)
: style ni
t
pic
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind Bernhar
d
sen
D
o
n
't expa
n
d
CR
L
F
s
w
hen nor
m
alizing
text du
r
i
ng
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-02
Eyvi
n
d Bern
h
ardse
n
Try normalizing fi
l
es to avoid delete/modify conflict
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-02
Eyvin
d
Bernhardsen
Avoid co
n
flic
t
s when merging branc
h
es with mixe
d
normalization
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 Hama
n
o
Merge b
r
a
nch 'cp/tex
t
con
v
-c
a
t-file'
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
Merg
e
bran
c
h
'pb
/
maint-perl-errmsg-no-dir'
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
Mer
g
e b
r
anch 'tr/send-email
-
8bit'
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
Merge br
a
nch 'js/maint-am-reba
s
e-
i
nvalid-author'
commit
|
commitdiff
|
tree
2010-06-27
Junio C
Hamano
Me
r
ge bra
n
ch 'ab/blame-textc
o
n
v
'
commit
|
commitdiff
|
tree
2010-06-27
Junio
C
Ham
a
no
Merge
b
ranch 'jn/show-num-walks'
commit
|
commitdiff
|
tree
2010-06-25
Jun
i
o
C
Hamano
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-06-25
R
amsay Jones
m
s
v
c: Fix som
e
compiler warnings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-25
Christian Cou
d
e
r
Doc
u
m
entation:
g
rep:
fix asciidoc
p
r
oblem with
-
-
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-24
Mic
h
ael J Gruber
git
-
cat-file
.
txt: Documen
t
--textconv
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-24
Ramsa
y
Jones
m
s
vc:
F
ix
s
ome "expr e
v
aluate
s
to function" compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-23
Junio
C
H
a
m
ano
Merge b
r
a
n
c
h
'jk/url-decode'
commit
|
commitdiff
|
tree
2010-06-23
Junio C H
a
mano
url
.
c:
"
<scheme>://" part at the
beginning
s
hould not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-22
Junio C
H
a
mano
Upd
a
t
e
draft release
n
otes to 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C Hamano
Me
r
ge bra
n
ch 'jc/maint
-
sim
p
ler-commo
n
-p
r
e
f
ix'
commit
|
commitdiff
|
tree
2010-06-22
Junio
C
H
amano
M
e
rge bra
n
ch 'sb/format
-
patch-signature
'
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io C Ham
a
n
o
M
erge
b
ranch 'mg/p
r
e
tty-magic-space'
commit
|
commitdiff
|
tree
2010-06-22
Junio C
Hamano
Merge br
a
n
ch 'jn/g
i
tweb-return-or-exit-cleanup'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'bd/maint-
u
npa
c
k-trees-p
a
rawalk-fix'
commit
|
commitdiff
|
tree
2010-06-22
Junio
C Hamano
Merge branch 'cc/cherry-p
i
ck-ser
i
es'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch
'jc/re
v
-l
i
st-ancestry-path'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Ham
a
no
Merge
branch
'
l
t/exte
n
ded-sha1-
m
atch-
c
ommit-wit
h
-reg
e
xp'
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio C
H
amano
Merge branch
'mai
n
t'
commit
|
commitdiff
|
tree
2010-06-22
J
u
n
i
o
C
Hamano
U
pdate draft re
l
ease no
t
e
s
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-rebase-i-abort' into ma
i
nt
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C Ha
m
ano
M
erge
b
ranch 'cc/maint-commit-reflo
g
-msg' i
n
to maint
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io C Haman
o
Merge branch '
j
k/m
a
int-adv
i
c
e
-empty-amend' into m
a
int
commit
|
commitdiff
|
tree
2010-06-22
Junio C Haman
o
Me
r
ge
branch
'
t
c/commit-a
b
brev-fix' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'jn/document
-
r
e
b
ase-i
-
p-limit
a
tion' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C Hamano
Mer
g
e branch 'jn/c
h
eckou
t
-doc' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch
'
cc/maint-diff
-
CC-binary' into maint
commit
|
commitdiff
|
tree
2010-06-22
J
un
i
o
C Hamano
Merge branch 'j
c
/t91
2
9
-
any-utf8' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C
H
amano
Me
r
ge branc
h
'cb/ls-f
i
le
s
-cdup' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Haman
o
Merge branch 'tc/merge-
m
-l
o
g' in
t
o
maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C H
a
mano
M
e
rge branch 'ph/clone-m
e
ssage-re
w
ord' into
m
aint
commit
|
commitdiff
|
tree
2010-06-22
J
unio C
Hamano
Merge branch 'jn/ma
i
nt-ame
n
d-missing
-
name' into ma
i
nt
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Mer
g
e
branch 'pc/remove-warn' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
am
a
no
t
ests: r
e
move
u
nnecessary '
^
'
from 'e
x
pr' regula
r
expr
e
ssion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hama
n
o
Merg
e
branch 'j
s
/main
t
-
rece
i
ve
-
p
ack-symref-alias'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Hamano
Merge
branc
h
'cc
/
ma
i
nt-comm
i
t-ref
l
og-msg'
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hamano
Merge bra
n
ch 'ic/maint-rebase-i-abort'
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C Haman
o
Merge
branch 'jk
/
main
t
-advice
-
empt
y
-amend'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Ha
m
ano
Merge
b
ranch 'eb/core-eol'
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C Hamano
Merge bran
c
h 'fg/autocrlf'
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hamano
Merge branch 'sm/branch-b
r
oken-ref'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
M
e
r
ge b
r
anch 'rr
/
par
s
e-date-refactor
'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
M
e
rge branch 'jn/document-reb
a
se-i-p-limitati
o
n
'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ha
m
ano
Merge br
a
nc
h
'tc/commit
-
abbrev-fix'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge
b
r
a
nch 'tr/r
e
c
e
iv
e
-pack-aliased-upda
t
e-fix'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ha
m
ano
Mer
g
e branch 'gs/u
s
age-to-stdout'
commit
|
commitdiff
|
tree
2010-06-21
J
u
n
io
C
H
ama
n
o
M
er
g
e branch 'js/async-thread'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Hamano
Mer
g
e
branch 'gv/
p
ortabl
e
'
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C Ham
a
no
Merge branch 'bc
/
port
a
ble'
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C
H
amano
Merge branch 'jn/gitw
e
b
-
fastcgi'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
H
amano
M
erge br
a
n
ch 'jn/checkout
-
doc'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge bran
c
h 'em/checkout
-
orphan'
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hamano
Dr
o
p i
t
ems that
a
re 1
.
7
.
1
.
1 fix
e
s from
t
he
1
.
7
.
1
release
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C H
a
mano
Merge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Update draft rel
e
ase notes to
1
.
7
.
1
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io C
Hamano
Me
r
ge
b
ranch 'mc/maint-zoneparse' int
o
maint
commit
|
commitdiff
|
tree
2010-06-21
J
uni
o
C Hamano
Merge b
r
an
c
h 'jk/diff-m-do
c
' i
n
to
maint
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io C H
a
mano
Merge bra
n
c
h
'
j
n
/main
t
-doc-i
g
n
o
re' into
m
a
int
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ha
m
an
o
Merge br
a
nch 'bs/userdiff
-
php' into main
t
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Hamano
Merge branch
'
jk/maint-sha1-file-na
m
e-fix' into mai
n
t
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge bran
c
h 'jk/ma
i
nt-pull-d
r
y-run-noop'
i
nto maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ham
a
n
o
Merge bra
n
ch 'bw/d
i
ff
-
meta
i
nfo
-
color' into
main
t
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io
C Hamano
Merge bra
n
ch 'cb/as
s
ume-unchanged-fix'
i
nto maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C H
a
mano
Merge branch 'j
n
/notes-doc' into maint
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io C Hamano
M
e
r
ge branch
'ab/test
-
cleanup' into m
a
int
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Hama
n
o
Me
r
ge branc
h
'
rs/diff-no-minimal'
i
nto maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
M
e
rge branc
h
'
b
g/apply-blank-trailing
-
context'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Ha
m
ano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-06-21
Æ
v
ar Arnfjö
r
ð B
j
armason
git-
c
vsser
v
er: fix e
r
r
o
r for inval
i
d pas
s
word f
o
rmats
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-21
Æva
r
A
rnfjörð Bjarmason
g
i
t-cvss
e
rver: t
y
po in a comment: bas
-> has
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-20
Jay
S
offian
g
i
tweb/Makefile: fix
t
y
po in gi
t
web
.
m
in
.
css
r
ul
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Clément Po
u
lain
t/
t
8007: test textc
o
nv support for cat-fi
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Clément
Poulain
textco
n
v: support for ca
t
_fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Junio
C
Hamano
U
pda
t
e
d
raft r
e
l
e
ase notes to 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Me
r
g
e
b
ranch 'cc/
m
aint-diff-CC-binary'
commit
|
commitdiff
|
tree
2010-06-18
Ju
n
io C Ham
a
no
M
erge branch 'by/diff-g
r
aph'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Me
r
ge branch
'cb/ls-fil
e
s
-cdup'
commit
|
commitdiff
|
tree
2010-06-18
J
u
nio C Hamano
Merge b
r
anch 'jc/
t
9
1
29-a
n
y
-utf
8
'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Merge branch 'rr/am-hel
p
'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Me
r
ge
branch 'jn/reb
a
se-cmdlin
e
-fix'
commit
|
commitdiff
|
tree
next