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-16
Junio
C Hamano
M
erg
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Up
d
a
t
e draft releas
e
notes
to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
M
e
rge branch
'
jn/maint-format-pa
t
c
h-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Mer
g
e b
r
anch 'ss/cherry-pick-x-do
c
'
int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge bran
c
h 'vr/merge-base-do
c
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ham
a
no
Merge br
a
n
c
h 'sr/maint-fast
-
import-tighten
-
opt
i
on-pa
r
s
ing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o C Hamano
Merge branc
h
'
jc/t1506-shell-para
m
-expans
i
on-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge branch 'jc/fix-add
-
u-unmerg
e
d' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Me
r
ge br
a
nch 'jn/gitweb-de
p
endency'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Me
r
ge branch 'jc/maint-branch-m
e
rgeoptions' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
a
mano
Merge br
a
n
c
h 'j
c
/
m
aint-add
-
p-ove
r
l
a
p
p
ing-h
u
nks'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Me
y
erin
g
Documentat
i
on/git-fs
c
k
.
txt
:
fix typo
:
unreada
b
le -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
s
e
nd-pack: avoid deadlock on git:// push with
f
a
i
l
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
conn
e
ct
:
l
et
c
alle
r
s know if
c
o
nnection is
a
socket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
co
n
nec
t
:
tre
a
t
gener
i
c proxy processes like ssh pro
c
esse
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
s
i
deband_demux(): fix de
c
l-aft
e
r-stm
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
King
t
3503: tes
t
cherry pickin
g
and r
e
vert
i
ng r
o
o
t
c
o
m
mits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
K
ing
r
e
vert: al
l
ow reverting
a root commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
cherry-pick:
handle root commits with
e
xternal
s
t
r
a
tegies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Makefile: Pass USE_LIBPCRE
dow
n
in GIT-BUILD-OPTIONS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hama
n
o
git-grep: update
t
ests no
w
regex
p
typ
e
is "last
o
ne
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
aman
o
Sy
n
c
r
elease notes for 1
.
7
.
6 to exclude w
h
at
ar
e
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Mer
g
e bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C
Haman
o
Upd
a
te draft release notes t
o
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Mer
g
e branch 'cn/format-patch-quiet' into
m
aint
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
Merge branch 'jm/merge
t
oo
l
-submodules
'
into main
t
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
Merge
bran
c
h 'jk/format-patch-quote-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Mer
g
e b
r
anch '
v
h/git-svn-doc' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Haman
o
git_open_noatime(): dro
p
unused para
m
eter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
sha1_file: typ
o
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C H
a
mano
read_sha1_file(): allow selective bypa
s
sing
o
f replacement
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Ham
a
no
inline lookup_replace_object() calls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
io C Hamano
read_sha
1
_
f
ile(): ge
t
rid of read_
s
h
a
1_file_repl()
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
t6050: make s
u
re we t
e
st n
o
t just commit replacement
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
De
c
lare lookup_rep
l
a
c
e_object
(
) in cache
.
h, no
t
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
M
e
rg
e
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Ævar Arnfjörð Bjarmason
Make
f
i
le
:
add
x
gettext
target for
*
.
sh
fi
l
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Ævar A
r
nfjörð Bjarmas
o
n
git-
s
h-
i
18n
.
sh: ad
d
GIT_GE
T
TEXT_POISON support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Æva
r
Arnf
j
örð Bjarm
a
s
on
git-sh-
i
18n
.
s
h
: add
no-op gettex
t
(
)
and eval_get
t
ext
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Ævar A
r
nfjörð
B
j
a
rmason
git-sh
-
i18n--envsubst:
o
ur own envsubst(
1
) for eval_
g
ette
x
t()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jo
n
a
t
h
a
n Nie
d
er
add,
merge
,
diff: do not use
s
trcas
e
cmp to compare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-14
J
e
ns Lehmann
Submod
u
le
s
: Don't
p
ars
e
.
gitmodule
s
when it contains
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-14
Heiko Voigt
test that
git status wo
r
ks with merge conflict in,
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
aman
o
Bigfile: teach "
g
it add" to se
n
d a
l
arge file
s
t
ra
i
ght
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Luke D
i
ama
n
d
gi
t
-p4: warn if git authorship won't be retaine
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Update
draft
rele
a
se notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Ham
a
no
Merge branch 'bf/commit-template-no-
c
leanup'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge b
r
a
nch '
j
c/t1
5
06-shell-para
m
-expansion-gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge branch 'r
r
/rerere
-
libify-
c
lear-gc'
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge br
a
nch 'js/main
t
-sen
d
-pack-stat
e
less-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C H
a
m
ano
Merge b
r
anch 'jh/dirs
t
at
-
lines'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge branc
h
'jc/fix-add-u-unmerg
e
d'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge br
a
nch 'jn/setup-revisions
-
g
lob-and-friends
-
pa
s
sthru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merg
e
br
a
nch 'cn/log-
p
arse-
o
p
t'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Prepare for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
a
m
a
no
Mer
g
e
branch 'a
w
/maint-
r
e
base-i-p-no-ff' into main
t
commit
|
commitdiff
|
tree
2011-05-13
J
unio C H
a
mano
Me
r
ge branch 'js/blame-
p
arsename' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
ni
o
C Hamano
Merg
e
branch 'gr/
c
vsimpor
t
-a
l
ternative-cvspa
s
s-loc
a
t
ion
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge br
a
nch '
c
j
/
p4
m
erge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge branch 'j
k
/merge-on
e
-file-working-tr
e
e'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Ham
a
n
o
Merge
b
ranch
'
j
c/fix-dif
f
-
files-
u
nm
e
rge
d
' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'mz/maint-
r
ename
-
unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
n Herland
t5400: Fix a couple of typo
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge branch 'nd/struct-pathspec'
commit
|
commitdiff
|
tree
2011-05-13
Johannes Sixt
Tweak t3102-ls
-
tree-wildcards to run on Wi
n
dows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Johanne
s
Sixt
t3703:
Skip
t
ests us
i
n
g directory name ":" on Windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hama
n
o
Merge b
r
anc
h
'jc
/
maint-1
.
7
.
4-p
a
thspec-st
d
in
-
and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Ha
m
an
o
Merge branch 'jc/maint-1
.
6
.
6
-
pathspec-stdi
n
-a
n
d-cmdline
'
commit
|
commitdiff
|
tree
2011-05-11
J
uni
o
C Haman
o
revision
.
c
:
leave a n
o
te fo
r
"
a
lone
:" enhancement
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Merg
e
branc
h
'jc
/
maint-1
.
6
.
6
-
pathspec-stdin-and-cmdl
i
ne'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio
C H
a
m
ano
Merge br
a
nch
'
j
c
/
maint-1
.
6
.
6-pathspec-stdi
n
-a
n
d-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ham
a
no
setup_revisions():
t
ake pathspec fro
m
command line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
H
amano
Update draft release notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
Mer
g
e branch
'jn/gitweb-depe
n
dency'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C
Hamano
Merge branch 'j
c
/maint-branch-mergeopti
o
ns'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ham
a
n
o
Merge bra
n
ch
'
jn/maint-t
e
st-m
e
rge-ver
i
fy-parents'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C Haman
o
Mer
g
e branch
'vh/config-interactive-
s
inglekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
M
e
r
ge branch
'jc/
m
a
i
n
t
-add-p-overlapping-hunks'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
M
erge branch '
s
r/
m
ain
t
-fast-import-tighten-opt
i
on-parsing
'
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Ha
m
a
no
Mer
g
e branch 'dm/http-cle
a
nup'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
Merge
b
ranch
'
jn/cta
g
s'
commit
|
commitdiff
|
tree
2011-05-11
Boris Faure
Do not strip empty lines / t
r
ailing spaces from a commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Junio
C
Hamano
Merge bra
n
ch 'fc/
c
ompletio
n
-
z
sh' into sg/
c
ompletion
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Junio C
Hamano
Revert "completio
n
: do
n
'
t
d
ecla
r
e 'local w
o
rd
s
' to
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
F
elipe
Contre
r
as
git-completion: fix regression in
z
sh su
p
port
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Conrad Irw
i
n
T
est
a
t
omic
git-commit --inte
r
a
c
tive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Nguyễ
n
Thái Ngọc Duy
t
37
0
3,
t4208
:
add test
c
as
e
s for magic pathspec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
J
unio C Hamano
r
e
v/path disambigua
t
ion:
further
restrict "m
i
sspelled
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Junio C H
a
m
a
n
o
fix over
s
low :/no
-
such-strin
g
-
ever-existed diagnostics
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Junio C Ham
a
no
fix
o
verstrict
:
<path> diagnosis
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hamano
g
rep: use get_paths
p
ec() cor
r
ectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Juni
o
C Hamano
paths
p
e
c:
d
r
op "lone : means no pathspec"
from get_
p
athspec()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Junio C Ham
a
no
Revert
"
magic
path
s
pec
:
ad
d
":(icase
)
path" to match
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Ng
u
yễn Th
á
i Ngọc Duy
sparse checkout: do
not eager
l
y de
c
id
e
the fate for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Nguyễn Thái Ngọc D
u
y
t1011: fix sparse-checkout initialization and
a
dd new
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Michael Schubert
t
a
g: disallow '-' as tag name
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Junio
C Hamano
g
i
t
-
g
r
e
p: do not die upon -F/-P when gre
p
.
e
x
ten
d
e
d
Regexp
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Conrad Irwin
Add co
m
mit to
list of config
.
sing
l
ekey
c
ommands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Conrad
I
rwin
Add support for -p
/
--patch to git-commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next