repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
ll-merge: replace flag argument with options struct
2010-08-26
Jonathan Nied
e
r
ll-merg
e
:
replace fl
a
g
a
r
gument with options struct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-26
Jonathan Ni
e
der
merge-rec
u
rs
i
ve: expose merge options f
o
r buil
t
in m
e
rge
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nathan Nieder
merge-r
e
cursive --r
e
norm
a
l
i
ze
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan
Ni
e
der
r
erere: never re
n
ormalize
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan Nie
d
e
r
rerere:
m
igrate to
parse-op
t
ions API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
o
natha
n
Nieder
t420
0
(
r
erere):
m
o
der
n
ize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
o
n
a
than
Nieder
l
l
-mer
g
e: let
c
aller decide
whether to renor
m
al
i
ze
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan Nieder
ll-me
r
ge:
m
ake flag easier
t
o popul
a
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan Nieder
Documentation/tech
n
i
cal: doc
u
men
t
l
l_me
r
ge
Cc: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nied
e
r
merge-trees: le
t
caller de
c
ide w
h
ether t
o
renormalize
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan
N
ieder
merge-trees: push choice to renormali
z
e away
from low
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nathan Nieder
t
6038 (me
r
ge
.
re
n
ormaliz
e
): check that it can be turned off
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jon
a
t
h
an Nieder
t
6
038 (
m
erge
.
re
n
ormalize): try checkout -m and
c
herry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
atha
n
Nieder
t
6038 (merge
.
re
n
o
r
malize): st
y
le nitpick
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
E
y
vind Bernha
r
d
s
en
Don't expand
CRLFs when norma
l
iz
i
ng
t
ext during merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
Eyvin
d
Be
r
n
h
ardsen
Try
nor
m
alizing
f
iles to a
v
oid delete/mod
i
fy conf
l
icts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind Bernhardsen
Av
o
id c
o
nfl
i
cts when merging branche
s
with m
i
xed normalization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
G
it 1
.
7
.
2-rc
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-27
Juni
o
C
H
aman
o
Merge b
r
anch 'cp/
t
extconv-
c
at-f
i
le
'
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
Merge branch 'p
b
/maint-perl-err
m
sg-
n
o-dir'
commit
|
commitdiff
|
tree
2010-06-27
Junio C H
a
mano
Merge branch 'tr/send-email-8bit'
commit
|
commitdiff
|
tree
2010-06-27
J
unio C Ha
m
ano
Merge branch 'js/maint-am-r
e
b
a
s
e-invalid-author'
commit
|
commitdiff
|
tree
2010-06-27
J
unio C Hamano
M
e
rge
b
r
anc
h
'
a
b/
b
lame-textc
o
nv'
commit
|
commitdiff
|
tree
2010-06-27
Junio C Hamano
Merge
br
a
n
ch 'jn/s
h
ow-num-w
a
l
ks'
commit
|
commitdiff
|
tree
2010-06-25
Junio C Hama
n
o
Merge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-06-25
Ramsay Jo
n
es
msvc: Fix some compiler wa
r
nings
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-25
Christian C
o
uder
D
o
c
u
m
e
n
ta
t
ion: g
r
ep: f
i
x a
s
ciido
c
proble
m
with --
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-24
Michael J Gruber
git-ca
t
-file
.
txt: Document --textconv
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-24
Ramsay Jones
msvc: Fix some
"
exp
r
eva
l
u
ates
to funct
i
on" co
m
piler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-23
Juni
o
C
Hamano
M
erge bra
n
ch 'jk
/
url-
d
ecode'
commit
|
commitdiff
|
tree
2010-06-23
J
u
nio
C
Hamano
url
.
c: "<
s
cheme>://" part at the beginn
i
n
g sh
o
uld n
o
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io C Hamano
Update draft release n
o
tes
t
o
1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-22
J
unio C Hamano
Merge branch
'
jc/maint-simpler-common-pr
e
fix'
commit
|
commitdiff
|
tree
2010-06-22
Junio
C Hamano
Merge branch 'sb/format-pat
c
h
-signature'
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio C Hamano
Merge branch 'm
g
/pretty
-
magic-s
p
ace'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branc
h
'jn/gitweb
-
retu
r
n-or-ex
i
t-clea
n
up'
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio C
Hamano
Merge bra
n
ch
'bd/maint-unpack-
t
rees-parawalk-fix'
commit
|
commitdiff
|
tree
2010-06-22
J
unio C Ha
m
ano
Merge b
r
anch 'cc/cherry-pick-series'
commit
|
commitdiff
|
tree
2010-06-22
J
unio C Ham
a
no
Merge branc
h
'
jc/rev-li
s
t
-
anc
e
stry-path'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'lt/extended-sha1-match-com
m
it-with-regexp'
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
i
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Upd
a
te draf
t
re
l
ea
s
e notes to 1
.
7
.
1
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-22
Junio C H
a
m
ano
Merge b
r
anch 'ic/maint-rebase-i-
a
bort
'
into
main
t
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'cc/maint
-
c
o
mm
i
t-reflog-msg' into
m
aint
commit
|
commitdiff
|
tree
2010-06-22
Junio C
Hamano
Merg
e
branch 'j
k
/ma
i
nt-
a
dvice-empty-am
e
nd' into maint
commit
|
commitdiff
|
tree
2010-06-22
Jun
i
o
C
Hamano
Merge
b
ranch 'tc/commit-abbrev-fi
x
'
into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Ha
m
a
n
o
M
er
g
e bran
c
h 'jn/document-rebase-i-p-
l
i
m
i
tation' into
.
.
.
commit
|
commitdiff
|
tree
2010-06-22
J
unio C Ham
a
no
Merge br
a
nch 'jn/ch
e
c
kout-d
o
c' into
m
a
int
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio
C Hamano
M
e
rge branch 'cc/ma
i
nt-di
f
f-CC
-
binary'
i
nt
o
m
aint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
M
erge bra
n
ch 'jc/t9129-a
n
y
-
utf8
'
i
n
to maint
commit
|
commitdiff
|
tree
2010-06-22
J
u
n
i
o
C H
a
m
a
n
o
Merge bra
n
ch 'cb/ls-files-cdup' i
n
t
o
ma
i
n
t
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merg
e
branch 'tc/m
e
rge-m-lo
g
' i
n
to
m
aint
commit
|
commitdiff
|
tree
2010-06-22
Junio C
H
amano
M
erge branch
'
p
h
/clone-m
e
ssage-rew
o
rd' int
o
maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C
H
a
mano
Me
r
ge branch 'jn/maint-
a
mend-missi
n
g-name' int
o
maint
commit
|
commitdiff
|
tree
2010-06-22
J
u
n
io C
H
a
mano
Merge
branch 'pc/rem
o
ve-
w
arn' into mai
n
t
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Hamano
tests: remove unnecessary '^' f
r
om 'expr'
r
egula
r
expression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
am
a
n
o
Merge branc
h
'js/maint-receive-pack-symref-alias
'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
amano
Merge branch 'cc/maint-commit-reflog-ms
g
'
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io C
H
a
m
ano
Merge b
r
anch 'ic/maint
-
r
ebase-i-abort
'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
Hamano
Merge branc
h
'jk/maint-a
d
vice-empty
-
am
e
nd'
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io C Hamano
Merge branch 'eb/core-eo
l
'
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
i
o C Ham
a
no
Merge branch '
f
g/a
u
tocrlf'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Hamano
Merge branch
'sm/branch-broken-ref'
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C Ha
m
ano
Merge br
a
n
c
h 'r
r
/parse-date-refactor'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Me
r
ge
b
r
anch 'jn/document-rebase-i-p-limitation'
commit
|
commitdiff
|
tree
2010-06-21
J
un
i
o C Hamano
Merge b
r
anch '
t
c
/commit-a
b
brev-fix'
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C Hama
n
o
Merge bran
c
h 'tr/receive-pack-aliase
d
-update
-
f
i
x
'
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io
C Hamano
Merge branch 'gs
/
us
a
ge-to-stdout'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Me
r
ge branch 'js/as
y
nc-thr
e
ad'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch 'gv/port
a
ble'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Mer
g
e branch 'bc/portable'
commit
|
commitdiff
|
tree
2010-06-21
Junio C
H
a
m
ano
Merge bran
c
h
'
jn/
g
i
t
w
eb-fast
c
gi
'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge
b
ranch '
j
n/check
o
ut-doc'
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C
Hamano
Merge b
r
anch '
e
m
/
checkout-orphan'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Drop items that are
1
.
7
.
1
.
1
fixes f
r
o
m
the 1
.
7
.
1
release
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Me
r
ge
branch 'maint
'
commit
|
commitdiff
|
tree
2010-06-21
J
u
n
io C Ham
a
no
Upda
t
e dr
a
ft 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
b
ranch 'mc/m
a
int-zoneparse' into
m
ain
t
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
Hama
n
o
Merge branch 'jk/diff-m-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Me
r
ge
branch 'jn/maint-doc-
i
gnore' into mai
n
t
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hamano
Merge branch 'bs/us
e
rdi
f
f-php' into maint
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio C
Hamano
M
e
rge branch 'jk/maint-sha1-fil
e
-n
a
me-fix' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio
C Hamano
Merge bra
n
ch
'jk/
m
aint-pull-dry-run-noop
'
into mai
n
t
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C Hamano
Merge branch '
b
w
/
diff-metainfo-c
o
lo
r
'
into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Hamano
Merge branch 'cb/assume-unchanged-fix
'
into ma
i
nt
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
H
amano
M
erg
e
branch 'jn/notes-doc' i
n
to main
t
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge br
a
n
c
h
'
ab/test-cleanup' into maint
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
io
C
Ham
a
no
Merge b
r
anch 'rs/dif
f
-n
o
-minimal'
in
t
o maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hama
n
o
Merge branch 'bg/apply-blank-tra
i
li
n
g-co
n
text' into
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Hamano
Me
r
ge br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2010-06-21
Ævar
Arnfjörð
Bjarmason
git-c
v
sserver: f
i
x
e
rror for invali
d
password formats
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-21
Æ
var
Ar
n
f
j
ör
ð
Bjarmason
git-cvsse
r
ve
r
:
typo in
a
comme
n
t:
b
as ->
h
as
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-20
J
a
y Soffian
gitweb/M
a
kefile: fi
x
t
y
po
i
n
g
i
tweb
.
min
.
css
r
ul
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Cl
é
ment Pou
l
ain
t/t800
7
: t
e
st t
e
xtconv support f
o
r cat
-
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Cl
é
ment Poulain
textconv: support for cat_file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
J
u
nio C Hamano
Upd
a
te
d
raft r
e
lease
n
otes to 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Merge branch 'c
c
/
m
ain
t
-diff-CC-bina
r
y'
commit
|
commitdiff
|
tree
2010-06-18
Jun
i
o C H
a
ma
n
o
Mer
g
e branch 'by/d
i
ff-gr
a
ph'
commit
|
commitdiff
|
tree
2010-06-18
J
u
nio C Hamano
Merge branch 'cb/ls-fi
l
e
s-cdup'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Merge branch 'jc/t912
9
-any-ut
f
8'
commit
|
commitdiff
|
tree
next