repo.or.cz
/
git
/
srabbelier.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation/technical: document ll_merge
2010-08-06
J
o
n
a
than Nieder
D
ocumentation/tech
n
ical: docu
m
e
nt ll
_
merge
Cc:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonatha
n
Nied
e
r
me
r
g
e-trees:
l
et caller d
e
c
i
de wheth
e
r t
o
r
e
norm
a
l
i
z
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
h
an Nieder
m
erge-trees
:
pu
s
h
choice to renor
m
alize
awa
y
from low
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nat
h
an
Nieder
t6038 (merge
.
re
n
o
r
malize): chec
k
t
hat it can be turne
d
off
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
t
6
038 (merge
.
renormaliz
e
): try checkout -m and cherry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
J
ona
t
han
N
ied
e
r
t
6038 (m
e
rge
.
renorma
l
i
ze): s
t
yle nitpicks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-02
E
yvind Be
r
nha
r
dsen
D
o
n't expand CR
L
Fs when normalizing
t
ext during m
e
rge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind Ber
n
hardsen
Try nor
m
a
lizing fi
l
e
s
to avoid delete/modify
conf
l
icts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-02
Eyvin
d
Bern
h
ard
s
en
Avoi
d
conf
l
icts when mer
g
ing br
a
nches with m
i
x
ed normalization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
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/
t
extcon
v
-cat-f
i
le'
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
Me
r
ge branch
'p
b
/maint-p
e
rl-errmsg-no-dir'
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hama
n
o
Merge branch 'tr/
s
end-email-
8
bit'
commit
|
commitdiff
|
tree
2010-06-27
J
unio C Hamano
M
e
rge branc
h
'js/ma
i
nt-am-r
e
base-in
v
a
l
i
d
-author'
commit
|
commitdiff
|
tree
2010-06-27
Junio
C
Hamano
Merge branc
h
'ab/bla
m
e-textcon
v
'
commit
|
commitdiff
|
tree
2010-06-27
Junio C Ham
a
no
Merge branch 'jn/s
h
o
w-num-walks
'
commit
|
commitdiff
|
tree
2010-06-25
J
u
nio C Hamano
M
erge branch
'maint'
commit
|
commitdiff
|
tree
2010-06-25
Ramsay Jones
ms
v
c
: Fix some compil
e
r warnings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-25
Christi
a
n Couder
Docu
m
entation: gre
p
:
f
i
x a
s
ciidoc
p
rob
l
em with --
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-24
Michael J Gruber
git-cat-file
.
txt: Document -
-
textconv
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-24
R
amsay Jones
msvc: Fix some "ex
p
r evaluates t
o
function" compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-23
Jun
i
o C Ham
a
n
o
Merge branch
'
j
k/url-decod
e
'
commit
|
commitdiff
|
tree
2010-06-23
J
unio C Hamano
ur
l
.
c: "<sch
e
me>
:
//" part at th
e
beginn
i
ng should
n
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
i
o
C
H
amano
U
pdate draft rele
a
se no
t
es
to
1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio C Hamano
M
er
g
e branch 'jc/
m
aint-
s
impler
-
common-prefix'
commit
|
commitdiff
|
tree
2010-06-22
Jun
i
o C Hamano
M
erge br
a
nch 'sb/format-patch-signature'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Mer
g
e
branch 'mg/pr
e
tty-magic
-
sp
a
ce'
commit
|
commitdiff
|
tree
2010-06-22
Junio
C Ha
m
ano
Merge bran
c
h 'jn/gitweb-return-or-exit-cleanup'
commit
|
commitdiff
|
tree
2010-06-22
Junio
C Hamano
Mer
g
e branch 'bd/m
a
int-unpack
-
trees-parawalk-fix'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Ha
m
an
o
Merge branc
h
'c
c
/cherr
y
-pick-ser
i
es'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merg
e
br
a
nch 'jc/rev-list-a
n
ce
s
tr
y
-path'
commit
|
commitdiff
|
tree
2010-06-22
Junio C
Hamano
Me
r
ge branch '
l
t/extended-
s
ha1-match-commit-w
i
th-regexp'
commit
|
commitdiff
|
tree
2010-06-22
Junio
C
Hamano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Update draft rele
a
se not
e
s to 1
.
7
.
1
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-22
J
unio C Hamano
M
erge
b
ran
c
h 'ic/maint-rebase-i-ab
o
rt' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Haman
o
Me
r
ge
b
ra
n
ch 'cc
/
maint-commit-re
f
l
o
g-msg' in
t
o
m
aint
commit
|
commitdiff
|
tree
2010-06-22
Junio C H
a
m
ano
Me
r
ge
b
ranch
'jk/maint-advice-empt
y
-amen
d
' into maint
commit
|
commitdiff
|
tree
2010-06-22
J
un
i
o C
Hamano
M
erge branch '
t
c/c
o
mmit-abbr
e
v-fix' in
t
o maint
commit
|
commitdiff
|
tree
2010-06-22
Jun
i
o C Hamano
Merge branch 'jn/d
o
cument-rebase-i-p
-
limitati
o
n
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-06-22
J
u
n
i
o
C
Hamano
M
erge
b
r
anch
'jn/checkout-doc' in
t
o m
a
int
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hama
n
o
M
er
g
e branch 'cc/m
a
i
n
t-dif
f
-CC-binary' into
m
aint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'jc/t9129-an
y
-u
t
f8' in
t
o main
t
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C Hamano
Merge b
r
a
nch 'cb/ls
-
f
i
les-cdup' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
M
erge
b
ranch
'tc/m
e
rge
-
m-
l
og'
i
nto
maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Ham
a
no
Merge branch 'ph/clone-message-rewo
r
d
' int
o
maint
commit
|
commitdiff
|
tree
2010-06-22
Junio
C Hamano
Merge branch 'jn/m
a
int-amend
-
mi
s
s
ing-na
m
e' i
n
to maint
commit
|
commitdiff
|
tree
2010-06-22
Junio
C
H
amano
Merge branch 'pc/remove-warn' i
n
to maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
tests: re
m
o
ve unnecessar
y
'^'
f
rom 'expr' regular expression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
amano
M
e
rge bran
c
h '
j
s/ma
i
nt-
r
e
cei
v
e-p
a
ck-sy
m
ref-alias'
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio
C Hamano
Merge branch 'c
c
/mai
n
t-
c
ommit-reflog-msg'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ham
a
no
M
e
rg
e
b
r
anch '
i
c/main
t
-rebase-i
-
abort
'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge b
r
anch 'jk
/
m
aint-advice-em
p
t
y-
a
mend'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Ham
a
no
Merge branch 'eb/c
o
re-eol
'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Hamano
Merge
bra
n
ch 'fg/
a
utocr
l
f'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch 's
m
/
b
ranch-broken-ref'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Me
r
ge branch 'rr/pars
e
-date-re
f
actor
'
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio
C
Hamano
Me
r
ge
branch 'jn/doc
u
ment-rebase-i-p-limi
t
a
tion'
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C Hamano
Merge branch 'tc/
c
ommi
t
-abbrev-fix'
commit
|
commitdiff
|
tree
2010-06-21
Junio C H
a
m
a
no
Merge branch 'tr/receive-pack-aliased-u
p
date-fi
x
'
commit
|
commitdiff
|
tree
2010-06-21
J
unio
C
Hamano
Merge branch
'
gs/usage-to-stdout'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Haman
o
M
e
rge branch 'js/async-thread'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch 'gv/portable'
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hama
n
o
Merg
e
branch 'bc
/
portable'
commit
|
commitdiff
|
tree
2010-06-21
Junio C H
a
mano
Merge
b
ranch
'
jn/gitw
e
b-fas
t
cgi'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
Hamano
Merge branch 'jn/checkou
t
-
d
oc'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
M
e
rge br
a
nch '
e
m/che
c
kout-orphan'
commit
|
commitdiff
|
tree
2010-06-21
J
uni
o
C Hamano
Drop items t
h
at are 1
.
7
.
1
.
1 fixe
s
f
r
om the
1
.
7
.
1 r
e
l
ease
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hama
n
o
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2010-06-21
J
u
n
io C H
a
mano
Update
d
r
aft release
n
ot
e
s to 1
.
7
.
1
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ham
a
no
Merge
b
r
a
nch
'
mc/mai
n
t-
z
oneparse
'
into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
amano
Me
r
ge b
r
anch 'j
k
/diff-m-doc'
i
nto
maint
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C
Ham
a
n
o
Merge
br
a
nch
'
j
n/main
t
-doc-ignore' i
n
t
o
maint
commit
|
commitdiff
|
tree
2010-06-21
J
u
n
i
o C Hamano
Mer
g
e branch
'bs/
u
serdiff
-
php
'
into
mai
n
t
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge br
a
nch 'jk/maint
-
sha1-file-name-fix'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2010-06-21
J
u
n
i
o C Hamano
Merge branch 'jk
/
m
aint-pul
l
-dry-run-noop' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Mer
g
e
b
ranch '
b
w
/diff-meta
i
nfo-color' i
n
t
o maint
commit
|
commitdiff
|
tree
2010-06-21
J
uni
o
C
Hamano
Merge branch 'cb/assume-unchanged-fix'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Hamano
Merge b
r
an
c
h 'jn/no
t
es-doc'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2010-06-21
J
u
n
io
C Hamano
Merge branch '
a
b/test-clea
n
up' into mai
n
t
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch 'rs/diff-no-
m
inimal'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge
b
ranch 'bg/apply-blank-trailing-context' into
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io C H
a
mano
M
e
rge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-06-21
Ævar
A
rnfjö
r
ð
Bjarma
s
on
git-cvss
e
rver: fix error for
i
nval
i
d password fo
r
mats
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-21
Æ
va
r
A
r
nfjörð Bjarmason
git-cv
s
server
:
ty
p
o in
a
comment
:
bas -
>
has
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-20
Jay Soffi
a
n
gitweb/Makefi
l
e
: fix t
y
po in git
w
eb
.
min
.
css rule
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Clé
m
ent Poulain
t/t8
0
07: te
s
t
t
ext
c
onv support for ca
t
-
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Clément Poulain
text
c
onv: support for cat_file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
J
unio C Hamano
Upda
t
e
draft release
n
o
tes to 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-06-18
Ju
n
io C Hamano
Merge branch
'
c
c
/ma
i
nt-d
i
ff-C
C
-b
i
nary'
commit
|
commitdiff
|
tree
2010-06-18
Juni
o
C Hamano
Merge
branch 'by
/
diff-graph'
commit
|
commitdiff
|
tree
2010-06-18
Juni
o
C Hamano
Merge branch 'cb/ls-
f
i
l
es-cdup'
commit
|
commitdiff
|
tree
2010-06-18
Junio C H
a
m
a
n
o
Merge branch 'jc/t9129-any-utf
8
'
commit
|
commitdiff
|
tree
2010-06-18
Junio C H
a
mano
Merge branch 'rr/am-help'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Merg
e
branch 'jn/reba
s
e
-cmdl
i
ne
-
fix'
commit
|
commitdiff
|
tree
2010-06-18
J
u
ni
o
C Hamano
Merge br
a
nch 'ps/g
i
tweb--br
o
wse-
c
hrome
'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
M
e
rge branch 'jk/a
m
-
s
kip-hint'
commit
|
commitdiff
|
tree
2010-06-18
Jun
i
o
C Hamano
Merg
e
b
ranch
'jh/diff
-
index-
l
ine-
a
bbrev'
commit
|
commitdiff
|
tree
2010-06-18
Junio
C Hamano
Merge
b
ranch 'ab/main
t
-perl-use-i
n
stlibdir'
commit
|
commitdiff
|
tree
2010-06-18
J
u
nio
C Hama
n
o
Merg
e
branch 'ec
/
diff-noprefix-con
f
i
g
'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
M
e
rge
b
ranch 'mg/s
t
a
t
us-b'
commit
|
commitdiff
|
tree
next