repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rerere: migrate to parse-options API
2010-08-06
Jona
t
h
an Niede
r
rerere: mi
g
ra
t
e
to
parse-options API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jon
a
than
N
ieder
t420
0
(rerere): modern
i
ze style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
ll-merge: let caller decid
e
w
h
ether
t
o renormalize
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
han Nieder
l
l
-merge: ma
k
e flag easier to populate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan N
i
eder
Do
c
umentation/te
c
hni
c
al:
do
c
umen
t
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
me
r
g
e-trees:
l
et caller d
e
cid
e
w
hether to re
n
orma
l
i
ze
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan N
i
eder
me
r
g
e
-tre
e
s
: push choice to re
n
ormalize awa
y
from low
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nathan Nieder
t6
0
3
8
(
m
er
g
e
.
renormalize):
c
heck that it can be turned
off
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan Niede
r
t6038 (merge
.
renormalize): try chec
k
out -
m
and cherry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
t6038 (merge
.
r
enormal
i
ze): style nitp
i
cks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind Ber
n
hardsen
Do
n
't expand CRL
F
s when normalizi
n
g
t
ext during merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind
Bernhardsen
Try n
o
r
mal
i
zing files to
a
void delete/mod
i
fy co
n
flicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
E
yvind Bernhardsen
A
void c
o
nflic
t
s
when merging branches with mixed norma
l
i
zation
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
Junio C Ha
m
ano
Merge branc
h
'c
p
/text
c
on
v
-cat-
f
i
l
e'
commit
|
commitdiff
|
tree
2010-06-27
Juni
o
C Hama
n
o
M
e
rge
b
r
a
n
ch '
p
b/maint-per
l
-errmsg-
n
o-dir'
commit
|
commitdiff
|
tree
2010-06-27
Junio C H
a
mano
M
erge branch '
t
r/send-email-8bit'
commit
|
commitdiff
|
tree
2010-06-27
J
u
nio C Ham
a
no
Merge b
r
an
c
h 'js
/
m
ai
n
t-
a
m-rebase-inval
i
d-author'
commit
|
commitdiff
|
tree
2010-06-27
Junio C
Hamano
Merge branc
h
'a
b
/b
l
a
me-te
x
t
conv
'
commit
|
commitdiff
|
tree
2010-06-27
Junio C
Hamano
Merg
e
b
ranc
h
'j
n
/show-
n
um-walks'
commit
|
commitdiff
|
tree
2010-06-25
Juni
o
C Hamano
Merg
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-06-25
R
amsay Jone
s
msvc: F
i
x
s
ome compile
r
warnings
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-25
Christian C
o
uder
Documentat
i
on:
grep: fix asciidoc prob
l
e
m
with --
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-24
Michae
l
J Grube
r
git-cat-file
.
t
xt: Doc
u
ment --text
c
onv
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-24
Ram
s
ay Jones
msvc:
F
ix
s
ome "exp
r
evaluates to fun
c
tion
"
compil
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-23
Junio C
Ha
m
a
n
o
Merge bran
c
h
'
j
k
/
u
rl-de
c
ode'
commit
|
commitdiff
|
tree
2010-06-23
J
u
ni
o
C Hamano
url
.
c
:
"
<scheme
>
://" part at the
beginning s
h
ould not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Upd
a
te draft releas
e
notes to
1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-22
Junio C
H
amano
M
erge branch
'jc/maint
-
s
impler-comm
o
n-prefix'
commit
|
commitdiff
|
tree
2010-06-22
Jun
i
o C Hamano
Merge branch
'
sb/format-patc
h
-signature'
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io C Haman
o
Merge br
a
nch 'mg
/
p
retty-magic-space'
commit
|
commitdiff
|
tree
2010-06-22
Ju
n
io
C
Hamano
Merge bran
c
h 'jn/gitw
e
b
-return
-
or-exit-cleanup'
commit
|
commitdiff
|
tree
2010-06-22
Junio C H
a
mano
Mer
g
e
bra
n
ch 'bd/maint-unp
a
ck-trees-parawa
l
k-fi
x
'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge bra
n
ch 'cc/cherry-pick-ser
i
e
s
'
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge
b
r
anc
h
'jc/re
v
-list-ancestry-path'
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio C Haman
o
Merge branch 'lt/extended-sha1-match-commit-wit
h
-reg
e
xp'
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio C Hamano
Merg
e
b
r
anch
'
maint
'
commit
|
commitdiff
|
tree
2010-06-22
Junio C
H
amano
U
pdat
e
draft
r
elea
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
Hamano
M
e
rge bra
n
ch 'ic/maint-rebase-i-abort' into main
t
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge branch 'cc/maint-co
m
mit-reflog-m
s
g' into main
t
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
M
erge branch '
j
k/maint-advi
c
e-empty
-
ame
n
d' into maint
commit
|
commitdiff
|
tree
2010-06-22
Jun
i
o C
H
a
m
ano
Merge branch 'tc/commit-abbr
e
v-fix' into main
t
commit
|
commitdiff
|
tree
2010-06-22
Jun
i
o
C
Ham
a
no
Me
r
g
e
b
ranch 'jn/document-reb
a
se-
i
-p-l
i
mitati
o
n' into
.
.
.
commit
|
commitdiff
|
tree
2010-06-22
Junio C
H
amano
Merge bran
c
h 'jn/checkout-doc'
int
o
maint
commit
|
commitdiff
|
tree
2010-06-22
Juni
o
C Hamano
Merge bra
n
c
h
'cc/maint-diff-CC-bina
r
y' i
n
to
m
ai
n
t
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Merge
branc
h
'jc/
t
9129-any-utf
8
'
i
nto maint
commit
|
commitdiff
|
tree
2010-06-22
Junio
C Hamano
M
e
rge branch 'cb/ls-
f
ile
s
-cdup'
into maint
commit
|
commitdiff
|
tree
2010-06-22
J
u
nio C Hamano
M
e
r
g
e branch 'tc/m
e
r
g
e-
m
-log'
into mai
n
t
commit
|
commitdiff
|
tree
2010-06-22
Junio
C
Hamano
Merge branch 'ph/clone
-
m
e
ssage-reword' into maint
commit
|
commitdiff
|
tree
2010-06-22
Junio C Hamano
Me
r
ge br
a
nc
h
'jn/maint-amend-missing-name' into maint
commit
|
commitdiff
|
tree
2010-06-22
Jun
i
o C Hama
n
o
M
erge branc
h
'
p
c/remove-warn'
i
nto
m
aint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
test
s
: re
m
ove unnec
e
s
sary '^
'
from 'expr' regular
e
xpression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
Hamano
Me
r
ge branch 'js/maint-receive-pack-symref-alias
'
commit
|
commitdiff
|
tree
2010-06-21
J
unio C H
a
mano
Merge branch
'cc/maint-com
m
it-
r
eflog-msg'
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio C Hamano
Merg
e
branch 'ic/main
t
-rebase-i-abort'
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C
Hamano
Merge
b
r
a
nch 'jk
/
m
a
int-advice-empty-amend'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge
branch 'eb/core-eol'
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C Hamano
Merge br
a
n
ch 'fg/aut
o
crlf'
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
Hama
n
o
Merg
e
branch 'sm
/
branch
-
broke
n
-re
f
'
commit
|
commitdiff
|
tree
2010-06-21
Junio C H
a
mano
Merge branch '
r
r
/
parse-date-ref
a
ctor'
commit
|
commitdiff
|
tree
2010-06-21
J
u
nio
C
Ha
m
a
n
o
Merge br
a
n
c
h
'
j
n
/
do
c
umen
t
-reba
s
e-i-
p
-lim
i
tation'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
M
erge branch 'tc/commi
t
-abbrev-f
i
x'
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hamano
Merge bra
n
ch
'
tr
/
rec
e
ive-
p
a
c
k
-al
i
a
s
ed-u
p
d
ate-fix'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Mer
g
e b
r
anch 'gs/usage-to-stdout'
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C Hamano
M
e
rge branch 'js/async-thread'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ha
m
ano
M
e
r
ge bran
c
h 'gv/p
o
rtable'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge b
r
anch 'bc/port
a
b
l
e'
commit
|
commitdiff
|
tree
2010-06-21
Junio C H
a
mano
Mer
g
e branch '
j
n/gi
t
web-fa
s
tcgi'
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o
C
H
a
m
a
n
o
Merge branc
h
'jn/ch
e
c
k
out-doc'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Haman
o
Me
r
ge branch 'em/check
o
ut-orphan'
commit
|
commitdiff
|
tree
2010-06-21
Jun
i
o C Hamano
Drop items
t
ha
t
ar
e
1
.
7
.
1
.
1 fixes fr
o
m the 1
.
7
.
1
rele
a
se
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
Junio
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-06-21
Junio C Haman
o
Updat
e
draft release notes to 1
.
7
.
1
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-21
J
unio C Hamano
Merge branch 'mc/ma
i
nt-zoneparse
'
into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C H
a
mano
Merge branch
'
jk/diff-m-doc'
i
nto
maint
commit
|
commitdiff
|
tree
2010-06-21
Juni
o
C H
a
mano
Merge branch 'jn/maint-do
c
-ignore' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Haman
o
Me
r
ge b
r
an
c
h 'bs
/
userdi
f
f-ph
p
'
into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Haman
o
Merg
e
branch
'
jk
/
maint-
s
ha1-f
i
le-name-fix' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Haman
o
Merge branch 'j
k
/m
a
i
nt-pu
l
l-dry
-
r
u
n-noop' int
o
maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ham
a
no
Me
r
ge b
r
anch 'bw/diff-metainfo-color' into m
a
int
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Hamano
Merge
branch '
c
b/
a
s
s
ume
-
u
n
changed-fix'
i
nto
ma
i
nt
commit
|
commitdiff
|
tree
2010-06-21
Junio C Hamano
Merge branch 'jn
/
not
e
s
-doc' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C Haman
o
M
e
rge branch 'ab/test-cleanup
'
in
t
o
ma
i
n
t
commit
|
commitdiff
|
tree
2010-06-21
Junio C Ha
m
ano
Merg
e
branch 'rs/diff-no-minimal' into maint
commit
|
commitdiff
|
tree
2010-06-21
Junio C
Ham
a
no
M
e
r
ge b
r
a
nch
'bg/a
p
ply-blank-trailing
-
context' into
.
.
.
commit
|
commitdiff
|
tree
2010-06-21
Ju
n
i
o C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-06-21
Ævar
A
rnfjö
r
ð Bj
a
rmaso
n
git-cvs
s
erve
r
: fix
erro
r
f
o
r i
n
v
a
lid p
a
ssword
formats
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-21
Ævar Arnfjörð Bjarmaso
n
git-cvsserver:
t
ypo in a comment: bas -> has
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-20
Ja
y
Soffian
gi
t
web/Makefile: f
i
x t
y
p
o in gitweb
.
min
.
css rule
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Clément Poulain
t/t8007: test text
c
onv support fo
r
cat-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
C
l
é
ment Poulain
textco
n
v: suppo
r
t for cat_fil
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Up
d
at
e
d
raf
t
r
eleas
e
n
o
tes to 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-18
Junio C
H
amano
Merge branch 'cc/maint-diff-CC-binary'
commit
|
commitdiff
|
tree
2010-06-18
Junio
C
Ha
m
ano
Merge branc
h
'by/diff-g
r
aph'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Merge branch 'cb/ls-files-cdup'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Ham
a
no
Merge b
r
anch
'
jc/t91
2
9-any-utf8
'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Merge branch '
r
r/am-help'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Mer
g
e branch 'jn/rebase-cmd
l
ine-fix'
commit
|
commitdiff
|
tree
2010-06-18
Junio C Hamano
Merge branch 'p
s
/gitweb--browse-chr
o
me'
commit
|
commitdiff
|
tree
2010-06-18
J
u
ni
o
C
H
amano
Me
r
g
e
branch 'jk
/
am
-
skip-hint'
commit
|
commitdiff
|
tree
next