repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'tr/add-i-no-escape'
2011-05-09
Junio C
Haman
o
Revert "
H
onor $(prefix)
set i
n
conf
i
g
.
mak* when defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
J
u
nio C Hamano
conv
e
rt: make it harder to screw up adding
a
con
v
ersion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
Haman
o
c
o
n
vert:
m
ake
it safe
r
to ad
d
conver
s
ion attributes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
conv
e
rt: give saner name
s
to crlf/eol variables, types
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
convert: renam
e
the "eol"
g
lobal variable to "cor
e
_e
o
l"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
Hamano
t15
0
7: avoid
"${p
a
rameter<op>'wo
r
d
'
}"
i
nside doubl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3701: add
-
p
-fix makes the last test to
p
a
ss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
rerere:
l
i
bify
rerere
_
clear() and rerere_gc(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C H
a
mano
m
e
rge: introduce mer
g
e
.
ff configuration
v
ariable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Merge bra
n
ch 'j
c
/
m
a
int-branch-
m
e
r
g
eop
t
ions
'
into
m
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
a
m
ano
merge: make branch
.
<name
>
.
mergeop
t
i
ons correctly overr
i
d
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C H
a
mano
Upda
t
e
dra
f
t release notes t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
Merge branc
h
'
jn/run-com
m
and
-
er
r
or
-
failure'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io
C
H
amano
Merge
b
ranch 'js/i
n
fo
-
man
-
path'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Merge br
a
n
c
h 'im/hashcmp
-
opt
i
m'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hamano
Merge bra
n
ch 'jk/merge-one-fi
l
e
-
w
or
k
i
n
g-tree'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
M
erge bra
n
ch 'jc/f
i
x-diff-
f
iles-unmerged'
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C H
a
man
o
Merge branch 'cj
/
p
4
merg
e
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Ha
m
a
no
Merge b
r
anc
h
'gr/c
v
simport-alternative-cvspass-loca
t
ion'
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
man
o
Merge bra
n
ch 'sg/complet
i
on-cleanup'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C H
a
mano
Me
r
ge branch 'js/blame-parsename
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
amano
Merg
e
branc
h
'
jk/format-patch-quote-special-in-f
r
om'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C
Hamano
Merge branch 'n
d
/struct-
p
athspec'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Ham
a
no
M
e
r
g
e
b
ranch 'aw/main
t
-rebase-i-p
-
no-ff
'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
Merge branch 'mg/alias-expose-pr
e
fix'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hamano
M
erge bra
n
ch
'
mg/di
f
f-uico
n
fig-
d
oc'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
Me
r
ge branch '
m
aint'
commit
|
commitdiff
|
tree
2011-05-05
Juni
o
C Hamano
Merge branch
'
js/maint-
1
.
6
.
6-s
e
nd-pa
c
k-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hama
n
o
t3701: fix here document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
n
o
Update dra
f
t r
e
le
a
se notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C H
a
ma
n
o
Merge branc
h
'ml/te
s
t-readme'
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
m
ano
Merge
b
ranch 'ft/gitweb-t
a
r-with-
g
zi
p
-
n
'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge
b
ranch 'mg/r
e
v-list-count-cherry'
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io
C
Hama
n
o
M
e
rge branch 'ss/doc-svn'
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o C H
a
mano
Merge bran
c
h 'jn/forma
t
-
p
atch-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branc
h
'vr
/
merge-bas
e
-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge br
a
nc
h
'ss/cherry-pick-x-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge branch 'jn/maint
-
format-patch-doc
'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge b
r
anc
h
'jk/f
o
rmat-patch-multiline
-
h
e
ader'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge branch 'jm/mergetool-submodules'
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Haman
o
S
yn
c
with 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C H
a
mano
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
m
a
no
Merge br
a
nch
'
j
h
/
d
irstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
ranc
h
'
s
p/maint
-
clear
-
po
s
tfie
l
ds' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
ranch
'
j
k
/
maint-s
t
ash-
o
ob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
amano
Merge
b
ranch 'jk/maint
-
upl
o
ad
-
pac
k
-shallo
w
' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bran
c
h 'd
m
/
s
tash-k-i-p' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merge b
r
anch 'j
c
/
pack-o
b
jects-bigfile
'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branc
h
'
m
g/r
e
flog-w
i
th-o
p
ti
o
ns' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bra
n
ch
'jk/stash
-
loosen-safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merg
e
b
ra
n
c
h
'ar/clean
-
r
mdir-em
p
ty' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
H
amano
M
erge branc
h
'mg/sha
1
-path-ad
v
ise' i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-05-02
Jun
i
o C Ham
a
no
Upda
t
e draft release notes to
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
Merge branch 'jk/
n
o
tes-ui-
u
p
da
t
es'
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
Me
r
ge branch 'ab/i18n
-
fi
x
up
'
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
Me
r
ge bra
n
c
h
'nm/submo
d
ule
-
updat
e
-force'
commit
|
commitdiff
|
tree
2011-05-02
Junio C Ham
a
no
Merg
e
branch 'jh/note
s
-add
-
ui'
commit
|
commitdiff
|
tree
2011-05-02
Juni
o
C
H
amano
M
er
g
e branch
'
nd/maint-se
t
up'
commit
|
commitdiff
|
tree
2011-05-02
Ju
n
io C Hamano
Merge branch 'mz/maint-rename-u
n
merged'
commit
|
commitdiff
|
tree
2011-05-01
Jun
i
o C H
a
mano
U
pda
t
e dra
f
t release n
o
tes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Junio C Ha
m
ano
Merge branch 'rs/
s
t
rbuf-
s
etlen-a
s
sert'
commit
|
commitdiff
|
tree
2011-05-01
Junio C H
a
mano
Merge branc
h
'vh/git-svn-doc'
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
"add -p": work-around an old l
a
zi
n
e
ss tha
t
d
oes not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add--interactive
.
perl: fac
t
or out repeated --recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C Hamano
t3701:
E
diting a split hunk in an
"add -p" session
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C H
a
mano
add -p: 'q' should r
e
a
l
ly quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
ano
M
erge branch
'maint'
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hama
n
o
S
t
art
1
.
7
.
5
.
1 mai
n
tenan
c
e
track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Haman
o
Me
r
ge branch 'mg/
x
-
y
ears-1
2
-months' int
o
maint
commit
|
commitdiff
|
tree
2011-04-28
Junio C Hamano
Me
r
ge branch
'j
c
/diff-ir
r
eversible-delete'
commit
|
commitdiff
|
tree
2011-04-28
Junio C Hamano
Me
r
ge
branch '
j
c/rename-degrade-cc
-
to
-
c'
commit
|
commitdiff
|
tree
2011-04-28
Juni
o
C Hamano
Merge
bran
c
h 'mz/reba
s
e'
commit
|
commitdiff
|
tree
2011-04-28
Junio C Ham
a
n
o
Merge b
r
anch 'en
/
merge-recu
r
sive'
commit
|
commitdiff
|
tree
2011-04-28
Jun
i
o C Hamano
Merge branch 'jh/dirstat'
commit
|
commitdiff
|
tree
2011-04-28
Junio C Hamano
Mer
g
e branch '
s
p/maint-clear
-
postfields'
commit
|
commitdiff
|
tree
2011-04-27
Jun
i
o C Ha
m
ano
Sta
r
t 1
.
7
.
6 c
y
c
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-27
Junio C
H
a
m
ano
Merge branch '
m
g/x-y
e
ars-12-months'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Hamano
Mer
g
e
branch 'cn/format-patch-quiet'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Hamano
Merge branch 'ef/maint-strbuf-init'
commit
|
commitdiff
|
tree
2011-04-27
Ju
n
io
C
Ham
a
no
Merge bran
c
h '
r
r/
d
oc-content-t
y
pe'
commit
|
commitdiff
|
tree
2011-04-27
J
u
nio
C
Ham
a
no
Mer
g
e bran
c
h 'jc/me
r
ge-das
h
-
p
revious'
commit
|
commitdiff
|
tree
2011-04-27
J
unio
C
Haman
o
M
er
g
e b
r
an
c
h 'dm/stas
h
-k-i-p'
commit
|
commitdiff
|
tree
2011-04-27
J
u
n
i
o
C Hamano
Merge
b
ranch 'rj/
s
parse'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Ham
a
no
Merge branch '
j
k/
m
ai
n
t-upload
-
pack-
s
hallow'
commit
|
commitdiff
|
tree
2011-04-27
Juni
o
C Hamano
Merg
e
branch 'nk/blame-ab
b
rev'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Ham
a
no
Me
r
ge b
r
anch 'jk/maint-st
a
sh-
o
ob'
commit
|
commitdiff
|
tree
2011-04-27
J
unio C H
a
mano
Merge br
a
nch 'dm
/
c
o
lor-palette'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Hamano
Merge branch 'jk/stash-loo
s
e
n
-
s
a
fety'
commit
|
commitdiff
|
tree
2011-04-27
Jun
i
o
C
H
a
m
ano
Merge branch 'jc/p
a
ck-objects-bigfile'
commit
|
commitdiff
|
tree
2011-04-27
J
unio C H
a
mano
Merge branch '
m
h/git-svn-automkdirs
'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Hamano
Merge br
a
nch 'mg/reflog-with-op
t
ions'
commit
|
commitdiff
|
tree
2011-04-27
Junio C H
a
mano
Merg
e
bran
c
h 'ar/clean-rmdir-empty'
commit
|
commitdiff
|
tree
2011-04-27
J
u
nio C Ha
m
ano
Merge b
r
anch
'mg/sha1-pa
t
h-advis
e
'
commit
|
commitdiff
|
tree
2011-04-26
J
u
nio C Hamano
h
ttp: clear POST
F
IELDS when initiali
z
ing a s
l
ot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
Junio C Hama
n
o
Merge b
r
an
c
h 'js/
m
aint-1
.
6
.
6-send-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C Hamano
F
ix "add
-
u" that sometimes fails t
o
resol
v
e unm
e
rged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
amano
diff-files: s
h
ow unm
e
rged entries correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Hamano
d
i
ff: r
e
m
o
ve
often unused parameters
from diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next