repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
help.c: Fix detection of custom merge strategy on cygwin
2011-05-20
Juni
o
C Hamano
Merg
e
branch 'j
k
/cherry-pick-roo
t
-with-r
e
solve'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge branch 'jc/m
a
int-p
a
t
h
spe
c
-
s
t
d
in-
a
nd-cmdline'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Haman
o
Merge 1
.
7
.
5
.
2 in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
unio
C Hamano
Rever
t
"M
e
rge
branch
'
en/merge-recurs
i
ve'"
commit
|
commitdiff
|
tree
2011-05-20
J
u
n
i
o
C Hamano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-19
Junio
C
H
ama
n
o
sho
w
: --ignore-mi
s
sing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-19
J
u
nio C Hamano
notes remov
e
: --stdin reads from the st
a
ndard inpu
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-19
Junio C Hamano
notes remov
e
: --ig
n
ore-missing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-19
Jun
i
o C Hamano
notes
r
e
m
o
ve: a
l
low rem
o
ving more
th
a
n one
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
J
unio
C
Hamano
Up
d
a
te release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C
H
amano
Merge
b
ranch 'js/maint
-
1
.
6
.
6-s
e
n
d-pack
-
stat
e
less-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
Merge b
r
an
c
h 'jc/convert
'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'ci/commit--interactive-atomic'
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Mer
g
e branch '
s
g/
c
ompletion-updates'
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Ham
a
no
Merge branch
'
k
k/maint-p
r
efix-in-
c
onfig-m
a
k'
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge branc
h
'mg/m
e
rge-ff-config'
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
ma
n
o
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Ha
m
ano
Update d
r
af
t
release notes to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
a
no
Me
r
g
e
b
r
a
n
ch
'
jn/main
t
-format-patch
-
do
c
' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e bran
c
h 'ss
/
cherry-pic
k
-x-doc' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
ranch 'vr/merge-bas
e
-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
i
o
C
Ham
a
no
M
e
rge branc
h
'sr/maint-fa
s
t-import-tighte
n
-option-parsi
n
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ham
a
no
M
erge br
a
n
ch 'jc
/
t15
0
6-shell-param-e
x
p
ansion-gotch
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
'
jc/
f
ix-add-u-unmerged' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
ma
n
o
M
e
rge b
r
anch 'jn/gitweb-dependency
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Merge branch 'jc
/
maint-br
a
nch-mergeoptions' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Ha
m
ano
Merge
branch 'jc/main
t
-add-p
-
over
l
a
p
ping-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
sideband
_
demux(): fix d
e
cl
-
after-stm
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Makef
i
le: Pass USE_LIBPCRE
d
own in G
I
T-BUIL
D
-OPTIONS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
H
a
man
o
git
-
grep
:
upd
a
te
test
s
now regexp
t
ype i
s
"la
s
t o
n
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Sync release
n
otes for 1
.
7
.
6
t
o ex
c
lude w
h
a
t
a
r
e
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
U
pdate dra
f
t
release n
o
tes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
Merge branch 'cn/format-
p
at
c
h
-
quie
t
' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Merge
b
r
anch '
j
m/me
r
get
o
o
l-submo
d
u
l
es'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Ha
m
ano
Merge branch 'jk/fo
r
mat-patch-quote-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Merge
b
r
a
nch 'vh/git-svn-doc' into m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
git_op
e
n
_
noatime(): d
r
op unused parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
s
ha1_file: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C
Haman
o
read_sha1_
f
i
le(): allow selective bypassing of re
p
l
a
cement
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
inline lookup_replace_o
b
ject()
c
a
lls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Ham
a
no
read_sha1_file(): get rid o
f
re
a
d_s
h
a
1_fil
e
_re
p
l()
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
t
6
050: make sur
e
w
e test not jus
t
c
ommit replacement
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
De
c
lare look
u
p
_replace_object() in cache
.
h, not in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Merge b
r
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Ha
m
ano
B
i
gfi
l
e
:
t
e
ach
"git add"
to send a large file straight
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Update draft relea
s
e notes t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge branch 'bf/comm
i
t-template-no-cleanup'
commit
|
commitdiff
|
tree
2011-05-13
J
uni
o
C
Hamano
Merge bran
c
h 'jc/t1506-shell-pa
r
am-expansion-gotcha'
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hama
n
o
Merge b
r
anch
'
rr/rerer
e
-
libify-clear-
g
c
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge branch 'js/m
a
i
n
t
-
send
-
pack-stateless-rpc-deadl
o
ck
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge branch
'jh/dirst
a
t-lines'
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
m
a
no
Merge b
r
a
nch '
j
c/fix
-
add-u
-
unmerged'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ranch 'jn/setup-revisions-gl
o
b-and-f
r
iends-passt
h
ru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
M
erge branch 'cn/
l
og-parse-opt'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
i
o C Ha
m
ano
Prepare f
o
r 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Me
r
ge
b
ranc
h
'a
w
/m
a
int-re
b
ase-i-p-no-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge b
r
anch 'js/blame-parsen
a
m
e
' into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
M
erge branch 'gr/cvs
i
mp
o
rt-alternative-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge br
a
nch 'cj/p
4
merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C H
a
ma
n
o
Merge branch 'jk/merg
e
-o
n
e-file-working-tree
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hama
n
o
M
e
rge branch 'jc/fix-
d
i
ff-files-unmerged
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge bra
n
ch 'mz/maint
-
rename-unmerge
d
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge bra
n
ch 'nd/struct
-
pathspec'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
Merge branch 'jc/maint-1
.
7
.
4-pathsp
e
c-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'jc/
m
aint-1
.
6
.
6-pathspe
c
-stdin-and-c
m
d
line'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hama
n
o
revision
.
c: lea
v
e a no
t
e for "
a
lone
:" enhanc
e
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
ano
Merge branc
h
'jc
/
maint-1
.
6
.
6-pathspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
a
no
M
e
rg
e
branch 'jc/maint-1
.
6
.
6-pat
h
sp
e
c-stdin
-
and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
ama
n
o
se
t
up
_
rev
i
sions(): take p
a
thspec
f
rom command l
i
ne
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
Update draft rele
a
se notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Ham
a
no
Mer
g
e b
r
anc
h
'
j
n/gitweb-depend
e
ncy'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Ham
a
no
Merge branch 'jc/maint-bran
c
h-merge
o
ptions'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
ano
Mer
g
e bran
c
h 'j
n
/maint-t
e
st-merge-verify-parents'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
ama
n
o
Merge bra
n
ch 'vh/
c
o
nfig-interactiv
e
-si
n
g
l
ekey
-
doc'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Merge branch 'jc/maint-add-p-over
l
apping-hunks'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C Hama
n
o
Merge branch 'sr/maint-fast-im
p
o
rt-ti
g
hten-opt
i
o
n-parsing'
commit
|
commitdiff
|
tree
2011-05-11
J
unio
C
H
am
a
no
Merge branch 'dm
/
h
tt
p
-cle
a
nup'
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Hamano
Merge branch
'
jn/ctags'
commit
|
commitdiff
|
tree
2011-05-10
Junio
C
Hamano
Merge branch 'fc/c
o
m
p
l
e
tion-zsh' into sg/comp
l
etion
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Ju
n
io
C Hamano
Revert "com
p
l
eti
o
n
:
don
'
t
declare 'loca
l
words' to
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Junio C Ham
a
no
rev/path disambiguation:
f
urther restri
c
t "m
i
sspelled
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Junio
C
Hama
n
o
fix oversl
o
w :/no-s
u
ch-string-ever-exis
t
ed diagnosti
c
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hamano
fix o
v
erstric
t
:<path> diagnosis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Junio
C H
a
mano
g
re
p
: us
e
g
et_pathspec() correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Junio
C
H
am
a
no
paths
p
ec:
drop "l
o
ne : means no pathspec"
f
rom
get_p
a
thspec()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
J
unio C H
a
ma
n
o
R
evert "magic pathspec:
a
dd
":(ic
a
se)path" to match
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Junio C
Hamano
git
-
gr
e
p: do not die upon -F/-P when grep
.
extendedRegexp
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C H
a
mano
Revert "Hon
o
r $(prefix)
s
et in co
n
fig
.
mak*
w
h
en defi
n
ing
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
J
u
nio C Hamano
c
o
n
v
ert: m
a
ke
i
t
harder to screw up adding
a
conversio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C
H
amano
convert: mak
e
it safer to add conversion attributes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C Ham
a
no
co
n
ve
r
t
:
give saner names to
c
rlf/eol vari
a
bl
e
s, types
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
c
o
nvert: r
e
name
the "
e
o
l
"
glo
b
a
l variable
to
"
core
_
e
o
l"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
index_fd
(
): s
p
lit
i
n
t
o two h
e
lper functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C
H
amano
i
ndex_fd(): tur
n
wri
t
e_object an
d
format_che
c
k
argume
n
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
t1
5
07: av
o
id "${parameter<op>'
w
o
r
d'
}
" inside double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3701
:
add
-
p-fi
x
mak
e
s t
h
e last test
t
o
p
ass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C
Ham
a
no
re
r
er
e
:
l
ib
i
f
y rerere
_
c
lear() and rerere_
g
c()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hama
n
o
merg
e
: intro
d
uce merge
.
ff
c
onf
i
g
u
r
a
t
i
o
n v
a
ri
a
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next