repo.or.cz
/
git
/
barrbrain.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-trees: let caller decide whether to renormalize
2010-08-06
Jona
t
h
a
n Nie
d
e
r
merg
e
-tree
s
: l
e
t
c
aller decide w
h
ether to
r
enormalize
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
J
on
a
than N
i
eder
mer
g
e-tre
e
s
: pus
h
cho
i
c
e
t
o
renorm
a
lize away
from l
o
w
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
t6038 (me
r
ge
.
renormali
z
e
)
: check t
h
a
t i
t
can be tur
n
e
d off
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonath
a
n Ni
e
der
t6038 (merge
.
renormalize): tr
y
c
heckout
-m and che
r
ry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
han
Nieder
t6038 (mer
g
e
.
r
e
normalize): styl
e
nitpicks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind Bernhardsen
Don't
expand
CRLF
s
when normali
z
i
n
g
text d
u
rin
g
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind B
e
rnhardsen
Try normalizing files to avoid delete/modify c
o
nflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-02
E
y
vind Bernhardsen
Avoid conflic
t
s when merg
i
ng bra
n
ches with mixed normaliz
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
Git 1
.
7
.
2-r
c
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-27
Ju
n
i
o C Hamano
Merge branch 'cp/tex
t
co
n
v-cat-fil
e
'
commit
|
commitdiff
|
tree
2010-06-27
Juni
o
C Hamano
Merge branch 'p
b
/
ma
i
nt-p
e
r
l-errmsg-no-dir'
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
Merge
b
ranch 'tr/send
-
email-8bit
'
commit
|
commitdiff
|
tree
2010-06-27
Junio
C
Ham
a
n
o
Merg
e
br
a
n
c
h 'js/maint
-
am-
r
eb
a
se-
i
nv
a
li
d
-author'
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
Mer
g
e br
a
nch
'ab
/
b
l
a
me-t
e
xtconv'
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
M
erge b
r
anch
'jn/show
-
n
u
m-walks'
commit
|
commitdiff
|
tree
2010-06-25
Ju
n
io C Ha
m
ano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-06-25
Ramsay Jones
msvc: Fix so
m
e c
o
mpiler warnings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-25
Christian Couder
Documenta
t
ion
:
gre
p
: fix asciidoc
p
rob
l
em with
-
-
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-24
Michae
l
J Gruber
git-ca
t
-file
.
t
x
t: Document --textconv
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-24
Rams
a
y J
o
nes
msvc: Fix some "ex
p
r ev
a
luates to function" co
m
piler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-23
Junio C Hamano
M
er
g
e branch
'jk/url-decode'
commit
|
commitdiff
|
tree
2010-06-23
J
u
nio C Hamano
url
.
c: "<scheme>://" pa
r
t
at the begi
n
n
i
ng should not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-22
Junio
C Hamano
U
pdate draft r
e
lease n
o
tes to
1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hama
n
o
M
e
rge b
r
a
n
c
h 'jc/maint-simpler-common-p
r
e
f
i
x
'
commit
|
commitdiff
|
tree
2010-06-22
Junio
C Hamano
M
er
g
e branch 'sb/format-patch-signature'
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C Hamano
Merge branch 'mg/pretty-magic-s
p
a
c
e
'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Ha
m
a
n
o
Merge
b
ranch 'jn/gitweb-retur
n
-or-ex
i
t-cleanup'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hama
n
o
M
e
r
ge b
r
anch 'bd/mai
n
t
-unpack
-
tree
s
-parawalk-fix'
commit
|
commitdiff
|
tree
2010-06-22
Junio C
H
amano
Merge branch
'
cc
/
c
h
erry-pick-series'
commit
|
commitdiff
|
tree
2010-06-22
Junio
C Haman
o
Merge bra
n
ch 'jc/
r
ev-lis
t
-ancestry
-
path
'
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio C Ha
m
ano
Merg
e
b
ranch '
l
t/extended-sha1-
m
a
t
ch-commit-w
i
th-
r
egexp
'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Ha
m
ano
Update d
r
aft rele
a
se notes to 1
.
7
.
1
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-22
Junio C Ha
m
ano
M
e
rge bra
n
ch '
i
c/
m
a
i
nt-reb
a
se-i-abort' i
n
to
ma
i
n
t
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hama
n
o
Merg
e
b
ranch 'cc/
m
aint-commit-reflog-ms
g
' into m
a
int
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio C Hamano
Me
r
ge branch
'
jk/maint-adv
i
ce-empty-ame
n
d'
i
n
to
maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Haman
o
Mer
g
e bra
n
ch
'tc/commit-abbrev-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io C Hamano
Merge branch 'jn/docum
e
nt-rebase-i-p-limitation'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2010-06-22
Junio
C
Hamano
M
erge branch 'jn/checkout-
d
oc' into m
a
int
commit
|
commitdiff
|
tree
2010-06-22
J
un
i
o
C
Hamano
Mer
g
e branch 'cc/mai
n
t-diff-CC-binary' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'jc/t9129-any-
u
tf8' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio
C Hamano
Merge branch '
c
b/ls-files-cdup'
i
nto m
a
i
nt
commit
|
commitdiff
|
tree
2010-06-22
Junio C Ha
m
ano
Merge
branch 't
c
/merge-
m
-l
o
g
' into m
a
int
commit
|
commitdiff
|
tree
2010-06-22
Junio
C
Haman
o
Merge bran
c
h 'ph/clone
-
message-reword' into ma
i
nt
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merg
e
branch 'jn
/
mai
n
t-amend-missing-name' into
maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branc
h
'pc/
r
emove-warn
'
i
n
to maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hama
n
o
tests: remo
v
e unnecess
a
r
y
'
^' from 'expr' re
g
u
lar expr
e
ssion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
M
erge br
a
nc
h
'
js/mai
n
t
-receive-pack-symref-al
i
as'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
Hamano
Merge b
r
anch 'cc/maint
-
c
ommit-reflog
-
msg'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
Hamano
Me
r
ge branch 'ic/main
t
-
r
eb
a
se-i-abort'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge br
a
n
ch 'jk
/
maint-advice-e
m
p
ty-am
e
nd'
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io C Hamano
M
e
rg
e
branch 'eb/core-eol'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge bran
c
h
'
f
g
/autocrlf'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Haman
o
Merge branch
'
sm/branch-b
r
o
ken-ref
'
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io C Hamano
Merge
b
ran
c
h
'
rr/parse-date-ref
a
ctor'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge b
r
anch 'jn/document-rebas
e
-i-p
-
limit
a
tion'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Ham
a
no
Merge b
r
a
nch 'tc/
c
ommit-abbr
e
v-fix'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Me
r
g
e branch '
t
r
/receive
-
pack-ali
a
s
e
d-up
d
ate-fix'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge b
r
anch
'
gs/u
s
age-to-
s
tdout'
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C Hamano
Me
r
ge br
a
nch
'js/async-thread'
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C Hamano
Merge branch 'gv/porta
b
le'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Mer
g
e branch 'bc/por
t
a
ble'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
M
e
rge b
r
anch 'jn/gitweb-fast
c
gi'
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio C Hamano
Merg
e
bran
c
h
'
j
n
/
c
h
e
ckou
t
-do
c
'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Haman
o
Merge
b
ranch 'em/chec
k
out-orphan'
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hamano
Drop items that are 1
.
7
.
1
.
1 fixes
from the 1
.
7
.
1
releas
e
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
J
u
n
io C Hamano
Me
r
ge
b
r
a
nch
'
maint'
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C
H
a
mano
Upd
a
te draft release 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
Merge branch 'mc/maint-zoneparse' i
n
to m
a
int
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Hamano
Merge bran
c
h 'jk/diff-
m
-doc' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2010-06-21
J
unio
C
Hamano
Me
r
ge b
r
an
c
h 'jn/maint-doc-ign
o
re' into
m
a
int
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Hamano
Merge bran
c
h 'bs/userdiff-
p
h
p
' into
ma
i
nt
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Mer
g
e branc
h
'jk/m
a
int-
s
ha1-file-nam
e
-fix' into maint
commit
|
commitdiff
|
tree
2010-06-21
J
unio C
Haman
o
Merge branch '
j
k
/m
a
int
-
pull-dry-run-noop' int
o
maint
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
H
amano
Merge bra
n
ch '
b
w
/
diff-metainf
o
-color' into ma
i
nt
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Hamano
Merge
branch 'cb/
a
ssume-unchange
d
-
f
ix'
into main
t
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io C
H
amano
Merge branch
'
jn
/
note
s
-doc' into maint
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio C Hamano
Merge branch 'ab
/
te
s
t-cleanup' into
m
ai
n
t
commit
|
commitdiff
|
tree
2010-06-21
J
u
n
io C Hamano
Merge br
a
n
c
h 'rs/diff-no-minimal' into
m
ain
t
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merg
e
br
a
n
c
h
'
bg
/
appl
y
-
blank-traili
n
g-context' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-06-21
Æv
a
r Arnfjö
r
ð Bjarmason
git-cvsse
r
ver: fix err
o
r for invalid passwo
r
d for
m
ats
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-21
Ævar Arn
f
jör
ð
Bjarmason
git-
c
vsserver: typo
in a
co
m
ment: bas -> has
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-20
Ja
y
Soffian
gitw
e
b/Makefile: fix typo in g
i
tweb
.
mi
n
.
c
s
s rule
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Clément Poulain
t/t
8
0
07: test te
x
tconv
s
upport for cat-fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
C
lé
m
e
n
t
P
oulain
textconv: su
p
port for cat_file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
J
unio C Hamano
Up
d
ate draft release n
o
t
e
s to 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Juni
o
C Haman
o
Merge branch
'
c
c
/
maint-diff-CC-binary'
commit
|
commitdiff
|
tree
2010-06-18
J
un
i
o C Hamano
Merge branch
'
by/diff-grap
h
'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Mer
g
e branch '
c
b/l
s
-files-cdup'
commit
|
commitdiff
|
tree
2010-06-18
Junio
C
Hama
n
o
Merge bran
c
h
'jc/
t
9129-any-utf8'
commit
|
commitdiff
|
tree
2010-06-18
J
uni
o
C Hamano
Merge branch 'rr/
a
m-h
e
l
p
'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Merge branc
h
'jn/r
e
base-cmdlin
e
-fix'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
M
e
rge
b
r
a
nch
'
ps
/
gitweb--browse
-
c
h
ro
m
e'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Merge br
a
nch '
j
k/
a
m-skip-hint'
commit
|
commitdiff
|
tree
2010-06-18
Ju
n
i
o C
Ham
a
no
Merge branch
'jh
/
diff-index-line-abb
r
ev'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
M
e
r
ge
b
ran
c
h 'ab/ma
i
n
t-perl-use-i
n
s
t
l
ibdir'
commit
|
commitdiff
|
tree
2010-06-18
Ju
n
io C Hamano
M
erg
e
branc
h
'ec/
d
iff-noprefix-confi
g
'
commit
|
commitdiff
|
tree
2010-06-18
J
u
nio C Hamano
Merge branch 'm
g
/status-
b
'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Mer
g
e branch
'
jn/gitweb-plackup
'
commit
|
commitdiff
|
tree
next