repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Make test case numbers unique
2010-01-21
Johannes
S
ixt
Make test case
numb
e
rs
u
niqu
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
c
onfl
i
ct-mar
k
er-size: add test and do
c
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Update d
r
aft release notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch
'
bw/cvsimp
o
rt'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Merge
branch 'jc/
c
heckout
-
merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge branch 'ag
/
patch-header-verif
y
'
commit
|
commitdiff
|
tree
2010-01-21
J
un
i
o C Ha
m
ano
M
e
rge branch 'jc/conflict-m
a
rker-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'ag/maint-apply-too-lar
g
e
-p'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io
C
Ha
m
ano
Merge
branch
'
ap/me
r
ge-back
e
nd-opts'
commit
|
commitdiff
|
tree
2010-01-21
J
u
ni
o
C Hamano
M
erge
b
r
anch 'nd/s
t
atus-p
a
rtial
-
refr
e
s
h
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge rem
o
te branch 'remotes/
t
rast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rge
bra
n
ch 'jh/notes' (early part)
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Merge branch 'jc/maint-
r
e
f
resh-index-is-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge branch 'rr/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
mano
Merge
branch 'jc/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge branch 'js/exec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h 'jc/ls-files-ig
n
o
r
ed-path
s
pec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
man
o
Merge br
a
nch 'jc/grep-lookahe
a
d'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Me
r
ge
b
ranch
'
jc/maint-s
t
rbuf-add-fix-doubli
n
g'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
man
o
Merge
b
ranch 'mm/confli
c
t-advice'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Me
r
g
e
branch 'da/
d
if
f
to
o
l'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'mh/rebase
-
fixup'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io
C
Haman
o
Merge branch 'ns/
r
ebase-au
t
o-squas
h
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branc
h
'mh/rebase-fixup'
(e
a
rly part
)
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Haman
o
Merge
branch 'il/push-s
e
t-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
Merge branch 'jk/w
a
r
n-aut
h
or-com
m
itt
e
r-afte
r
-commit
'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ha
m
ano
Merge branch 'jc/
i
d
ent'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ham
a
no
Merge
b
r
a
nch '
t
r/htt
p
-
pu
s
h-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
M
e
rge b
r
an
c
h 'bk/fix
-
relati
v
e-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge br
a
n
c
h 'sd/cd-
p
-
show-t
o
p
lev
e
l'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
Hamano
Merge bra
n
ch 'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
Hamano
d
ate
.
c: mark file
-
local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Sync with 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
G
it 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
M
erge branch 'bg/maint
-
r
e
mote-update-default'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
M
erg
e
branch 'sb/maint
-
o
c
t
opus' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Me
r
g
e b
r
anch 'b
g
/ma
i
nt-ad
d
-all-doc'
i
nto maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Me
r
ge bran
c
h
'mai
n
t-1
.
6
.
5'
i
nto maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ha
m
ano
Merge
b
r
an
c
h
'j
k
/maint-
1
.
6
.
5-reset-
h
ar
d
' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
t
r/m
a
int-1
.
6
.
5
-
bash-prompt-
s
ho
w
-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
Ham
a
no
M
erge branch 'dp/maint-1
.
6
.
5
-fast-i
m
po
r
t-
n
on-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h
'jm/maint-1
.
6
.
5-grep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Fix
"
che
c
k
out A
.
.
.
" s
y
nonym for "c
h
eckout
A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
st
a
tus: don't require the repository to be writa
b
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
o
hannes S
i
xt
Make
f
ile
:
honor
N
O_CURL wh
e
n s
e
tting REM
O
TE_C
U
RL_*
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Tar
m
igan Casebol
t
ident
.
c:
re
p
l
a
c
e fprint
f
w
ith fput
s
to suppres
s
comp
i
ler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Nguy
ễ
n Thái Ngọc D
u
y
r
m: only refre
s
h entries t
h
at we may touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
David Ripton
b
i
sect:
fix singular/plu
r
a
l
grammar
nit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben
Walto
n
cvsimport: standarize system() calls to
e
xternal g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimp
o
rt
:
standarize open()
calls to
e
x
t
e
rnal g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
B
en W
a
lton
cvsimpor
t
:
moderni
z
e
c
allouts to git su
b
commands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
n
o
Merg
e
b
r
anch
'maint-1
.
6
.
4
'
into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge branch
'
m
ai
n
t-1
.
6
.
3' i
n
to maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge branch 'mai
n
t-
1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io
C Hamano
Merg
e
commit
'
v1
.
6
.
4
.
4
-
8
-g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Fix mis-b
a
ckp
o
rt of t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
man
o
U
pdate draft
r
e
l
ease notes to
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
U
p
date draft rele
a
se
notes t
o
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
M
e
rge bra
n
ch 'dp/m
a
int-1
.
6
.
5-fa
s
t-impo
r
t-non-com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
r
ge branch
'
jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge b
r
anch
'pc/u
n
interesting-submodule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branc
h
'nd
/
include-termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C Hamano
Merge
branch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
A
n
dreas Gruenbacher
builtin
-
apply
.
c:
fix t
h
e ---
and +++ header
file
n
ame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Danie
l
Barkalow
Replac
e
parse_blob() with an explanatory comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Merge branc
h
'jm/
m
a
int-1
.
6
.
5-
g
rep-NU
L
-te
r
m
i
na
t
e' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
im
Me
y
ering
grep: NUL t
e
rm
i
na
t
e in
p
ut
f
rom
a
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
A
ndreas Gr
u
enbach
e
r
built
i
n-apply
.
c
:
Skip filenames without e
n
ough com
p
onents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
i
o C Hamano
symlinks
.
c: remove unused function
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
object
.
c: re
m
ove unused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
Document that
me
r
ge strategie
s
ca
n
n
o
w take thei
r
o
w
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Penna
r
un
E
x
ten
d
mer
g
e-subtree tests to test -Xsubtree=dir
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
Make "s
u
btree" part more orthogonal to t
h
e r
e
st of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
p
u
l
l: Fix parsing of -
X
<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pen
n
arun
T
each git-pull to pas
s
-X<
o
ption> to g
i
t-merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
g
i
t merge
-
X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
H
a
man
o
Update draft release
n
ot
e
s to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C Hamano
Me
r
g
e branch 'tc/t
e
st-l
o
ca
t
e
-
htt
p
d'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
Merge bran
c
h 'jh
/
c
o
m
m
it-
s
tatu
s
'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C H
a
mano
M
e
r
ge
b
ranch '
j
n/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
M
erge branch 'jc/m
a
int-1
.
6
.
1-ch
e
c
k
o
u
t-
m
-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hama
n
o
Me
r
ge
b
ran
c
h 'tc/clone-v-progr
e
ss'
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C H
a
mano
Merge branch 'tc/smart-http-
r
est
r
i
ct'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Merge branch '
j
k/run-c
o
mm
a
nd-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge b
r
an
c
h '
s
r/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Update COP
Y
I
N
G with GPLv2 wi
t
h new
F
SF address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Ham
a
no
user_ident_sufficiently
_
given(): re
f
actor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
use
r
_
i
den
t
_sufficien
t
ly_given(): refactor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C Hamano
r
erere:
h
onor
conf
l
ict-marker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
rerere: prepare for customizable
c
onflic
t
marker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
c
o
mmit
.
c::print_summary: do n
o
t r
e
l
e
a
se
t
he format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
conflict-mar
k
er-size: n
e
w attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rer
e
re: use ll_merge() instead
o
f usi
n
g xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
mano
merge-tree:
u
se
l
l_merge()
n
ot xdl_merg
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merg
e
():
allow p
a
ssing down marker_
s
ize in
xmparam_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
xdl_merge(
)
: intro
d
uce xmpa
r
am_t
f
or merge
s
pecif
i
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next