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
mergetool: don't skip modify/remove conflicts
2011-02-16
Martin v
o
n
Z
weigberg
k
mer
g
etool:
d
o
n't skip modi
f
y/remo
v
e conflict
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-16
Martin
von Z
w
eigbergk
rerere "remaining"
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-05
Junio
C
Hamano
Git 1
.
7
.
4-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-05
J
unio C
Ha
m
a
no
M
e
r
ge branch 'maint
'
t
o
s
ync
w
ith 1
.
7
.
3
.
5
commit
|
commitdiff
|
tree
2011-01-05
Junio
C
H
amano
Git 1
.
7
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-05
J
u
nio C Ham
a
n
o
Merge bran
c
h 'jn/svn-fe' (early part)
commit
|
commitdiff
|
tree
2011-01-05
Juni
o
C Hamano
Merge branch 'a
o
/t9001
-
fix'
commit
|
commitdiff
|
tree
2011-01-05
J
u
ni
o
C Haman
o
Merge
b
ranch 'pw/co
n
vert-pathname-substitut
i
o
n
'
commit
|
commitdiff
|
tree
2011-01-05
Junio C Hamano
M
erge
branch
'
mg/cvsimpor
t
'
commit
|
commitdiff
|
tree
2011-01-04
Antonio Ospite
t
/
t
9
001-send-email
.
sh: fix
'
&
&' chain in
s
ome test
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
Mich
a
el J G
r
uber
cv
s
import:
hand
l
e the parsing
o
f
uppercas
e
config options
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-01-04
Jonathan
Nieder
daemon: su
p
port
<
direc
t
ory> arg
u
m
ents again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
R
a
l
f Wild
e
nh
u
e
s
Fix typo
s
i
n
t
he
d
o
cum
e
ntati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
Jonathan Nieder
gitweb: ski
p
logo in atom f
e
ed whe
n
there is none
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-29
Robin H
.
Johnson
t
9001: Fix t
e
st p
r
erequisites
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-28
Ju
n
i
o
C Hamano
Git
1
.
7
.
4-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-28
J
unio
C
Hamano
Merg
e
bran
c
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2010-12-28
Junio
C Ham
a
no
Prepare for
1
.
7
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-28
Junio C Ham
a
no
Merge branch 'jk/
c
ommit-die-on-
b
o
g
us-ident' into maint
commit
|
commitdiff
|
tree
2010-12-28
Ju
n
io C Hamano
Merge branch 'ks/blame-wo
r
ktr
e
e-tex
t
conv-cached' into
.
.
.
commit
|
commitdiff
|
tree
2010-12-28
Jun
i
o C H
a
mano
Merg
e
branch '
j
c
/
maint-rebase-
r
ewri
t
e-l
a
s
t
-
skip' into
.
.
.
commit
|
commitdiff
|
tree
2010-12-28
Jun
i
o C Hamano
Merg
e
branch '
j
c/m
a
int-am-abort-safely' i
n
t
o maint
commit
|
commitdiff
|
tree
2010-12-28
Junio C
H
amano
M
e
r
ge branch 'kb/maint-status-cquote' into
ma
i
n
t
commit
|
commitdiff
|
tree
2010-12-28
Bran
d
o
n Cas
e
y
t9001: u
s
e older G
e
topt
:
:
L
ong boolean prefix '--no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-28
Junio C
H
a
m
ano
M
e
rge
b
ranch 'jc/maint-rebase-rewrite-last-sk
i
p
'
commit
|
commitdiff
|
tree
2010-12-28
Junio C Ha
m
a
n
o
Me
r
ge branch 'nd/setup'
commit
|
commitdiff
|
tree
2010-12-28
R
obin H
.
J
ohnson
F
ix false positives in t3
4
04 due
to SHE
L
L=/bin/false
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-27
Nguyễn Thái Ngọ
c
Duy
se
t
up_work_
t
ree: adjust relative $GIT_WORK_TRE
E
aft
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-26
Junio C Hamano
Me
r
ge branch 'rs/maint
-
diff-fd-leak
'
i
n
to maint
commit
|
commitdiff
|
tree
2010-12-26
René Scha
r
fe
close file on error in
r
ead_mmfile()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-23
Junio C
Ham
a
no
M
erge branch 'rj/maint
-
difftool-cygwin-wor
k
around'
commit
|
commitdiff
|
tree
2010-12-23
Junio C Haman
o
Merg
e
branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2010-12-23
B
r
an
d
o
n
Case
y
Makefile: add NO_FNMATCH
_
CASEFOLD to IRIX se
c
tion
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-23
Bran
d
o
n
Casey
t
es
t
-
lib
.
sh/test_decode
_
color
(
): u
s
e o
c
tal not he
x
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-23
Jun
i
o C Ham
a
no
rebase --skip
:
c
orrectly w
r
a
p
-up w
h
e
n s
k
ipping th
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Junio C Hamano
t00
2
1:
a
voi
d
getting
f
ilter
k
illed
w
i
t
h SIGPIPE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
J
u
nio
C Hamano
M
e
r
ge branch
'
r
j/main
t
-te
s
t-
f
ixes'
commit
|
commitdiff
|
tree
2010-12-22
J
u
ni
o
C H
a
mano
Me
r
ge branch 'jc/maint-am-a
b
ort-safely'
commit
|
commitdiff
|
tree
2010-12-22
Junio C Ha
m
ano
Merge
b
ra
n
ch 'jk/commit-
d
ie-on-
b
ogu
s
-
i
d
ent'
commit
|
commitdiff
|
tree
2010-12-22
Ju
n
io
C
Ham
a
no
Merge
branch 'pd/ba
s
h-4-co
m
pletio
n
'
commit
|
commitdiff
|
tree
2010-12-22
Junio
C H
a
m
ano
Merg
e
br
a
nch 'nd/maint-fix-add-typo-
d
etection'
commit
|
commitdiff
|
tree
2010-12-22
Juni
o
C H
a
m
ano
Merge branch 'tf/commit
-
l
i
st-pre
f
ix'
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn Thái Ngọc Duy
git
.
txt: correct
where --work-tree path is relative
to
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn Thái
N
gọc Duy
Revert "Documenta
t
ion: always
respect core
.
w
o
rktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Jonath
a
n
N
i
e
der
t0001: t
e
st
gi
t
i
n
it when
run v
i
a an a
l
ias
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Ngu
y
ễn Thái Ngọc Duy
Remov
e
all lo
g
ic f
r
om get_gi
t
_work_tree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
N
g
u
yễn Thái Ngọc
Duy
set
u
p: re
w
or
k
setu
p
_explicit_gi
t
_dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn Thái Ngọc Duy
setup: clean up setup_dis
c
overed_
g
it_
d
ir
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Michael J Gr
u
be
r
t1020-s
u
bd
i
r
e
ctory
:
test ali
a
s expansion
i
n a sub
d
irect
o
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Nguy
ễ
n Thá
i
Ng
ọ
c Duy
setup
:
clean up
setup
_
bare_git_dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
N
g
uyễn Thái Ngọc Duy
setup: li
m
it
g
et_git_work_tr
e
e
(
)'s to exp
l
icit setup
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn
T
h
ái Ngọc Duy
Use git_confi
g
_
ea
r
ly() i
n
stead of git_config() during
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn
T
h
á
i
Ngọc Duy
A
d
d git_config_early()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Pete Wyckof
f
convert filter: supply pa
t
h to external driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-21
Junio C Hamano
Mer
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-12-21
Jun
i
o C Haman
o
Merge branch 'ks/bl
a
me-wor
k
tree-text
c
onv-cached'
commit
|
commitdiff
|
tree
2010-12-21
Junio C Hamano
Mer
g
e
b
r
a
n
c
h 'jk/t2107-now
-
passes'
commit
|
commitdiff
|
tree
2010-12-21
Junio C Haman
o
Merge
branch 'jk/maint-decorate-01-bool'
commit
|
commitdiff
|
tree
2010-12-21
Ju
n
io C H
a
mano
Mer
g
e branch
'
tc/completion-reflog'
commit
|
commitdiff
|
tree
2010-12-21
Junio C Hamano
Mer
g
e branch 'nd/
o
n
e
line-sha1-name-fro
m
-specific-ref
'
commit
|
commitdiff
|
tree
2010-12-21
Junio C
Ha
m
a
no
M
erge
b
ranch 'jn/maint-git
w
eb-pathinfo-f
i
x'
commit
|
commitdiff
|
tree
2010-12-21
Jona
t
h
a
n Nieder
t00
5
0: fix printf for
m
at strings for po
r
tability
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-21
Ramsay Jon
e
s
t3419-
*
.
sh:
F
i
x
arithme
t
ic expansi
o
n syntax error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-21
Junio C Hamano
am --abort: keep
u
nrelated co
m
mit
s
since the last
f
ailure
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-21
Ju
n
io
C Ha
m
ano
set_try_to_fr
e
e_routine
(
N
U
LL) means "do nothing spe
c
ia
l
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-21
J
u
n
i
o C Hamano
commit:
die before
a
sking to edit the log message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-21
Martin von Zweigbergk
completio
n
: add missing confi
g
u
rat
i
on varia
b
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-20
Jeff Ki
n
g
i
dent: die on bogus date for
m
at
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-20
Kirill Smelk
o
v
fill_textconv
(
)
:
D
o
n't get/put cache if
sha1 is not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-20
Kirill Smelkov
t/t8006:
Demonstrate blame is broken when
cachetextconv
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-20
Junio C Hamano
M
e
rge branch 'maint
'
commit
|
commitdiff
|
tree
2010-12-19
Jo
n
a
t
ha
n
Nieder
t93
0
0: use perl "head -c"
clone in place of "
d
d bs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-19
Jeff King
t2107: mark p
a
s
s
in
g
test as su
c
cess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-19
Je
f
f King
hand
l
e
arbitr
a
ry ints
i
n
git
_
co
n
fig_maybe
_
bool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-19
Thiago Farina
bui
l
tin
/
rm
.
c:
U
se ALLOC_GROW inst
e
ad o
f
alloc_nr and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-19
T
hiago
F
arina
bu
i
ltin
/
branch
.
c: Use ALLOC_GROW
ins
t
ea
d
of alloc_nr
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-19
Jakub Narebsk
i
gitweb: In
c
lude l
i
nks to feeds i
n
HTML header only
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-19
Mark
Lodat
o
f
sck
d
o
c
s: remove o
u
tdated and useless diagnost
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-19
Thomas Rast
userdiff: fix typo in r
u
by and python word
re
g
exes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-17
V
asyl' Vavrych
u
k
trace
.
c:
ma
r
k file-local
function
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-17
Tay
R
a
y
Chuan
ba
s
h compl
e
ti
o
n: add b
a
sic support for git-r
e
f
log
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-17
Jiang Xin
Fix typo in git-gc d
o
cu
m
en
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-17
Junio C Hama
n
o
Update
dr
a
ft
release
notes to 1
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-17
Junio C
H
aman
o
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2010-12-16
Ng
u
yễn Thái Ngọc Duy
ge
t
_sha1: ha
n
dle s
p
ecial
c
ase $commit^{/}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-16
Michael J Gruber
difftool
:
provide
ba
s
ename t
o
e
x
ternal tools
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-16
Mi
c
hael J Gruber
git-
d
ifftool
.
txt: correct the des
c
ri
p
t
i
on of
$
BASE
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-16
Junio C Hamano
Merge b
r
a
n
ch '
k
b/diff-C-M-
s
ynonym'
commit
|
commitdiff
|
tree
2010-12-16
Junio C Hamano
Merge
b
r
a
nch 'jn
/
fas
t
-impo
r
t-bl
o
b-acces
s
'
commit
|
commitdiff
|
tree
2010-12-16
J
unio C
Hamano
Merge br
a
nch '
j
l/fetc
h
-submodu
l
e-
r
ecursive'
commit
|
commitdiff
|
tree
2010-12-16
Junio
C
Hamano
Merg
e
bra
n
ch 'rj
/
msvc-
f
ix'
commit
|
commitdiff
|
tree
2010-12-16
J
unio C Hamano
M
e
r
g
e branch
'nd/
e
xtended-sha1-relpa
t
h'
commit
|
commitdiff
|
tree
2010-12-16
Jun
i
o C Hamano
Me
r
g
e branc
h
'aa
/
status-hilite-br
a
nch'
commit
|
commitdiff
|
tree
2010-12-16
Junio C Hamano
M
e
r
ge branch 'ak/describe-exa
c
t'
commit
|
commitdiff
|
tree
2010-12-16
J
u
nio
C Ha
m
ano
Merge
bra
n
ch 'nd/
m
aint-relative'
commit
|
commitdiff
|
tree
2010-12-16
Ju
n
io
C
Hamano
Merge branc
h
'jn/maint-sv
n
-f
e
'
commit
|
commitdiff
|
tree
2010-12-16
Junio
C
Hamano
Merge branch
'jc/ma
i
nt-svn-info-test-fix
'
commit
|
commitdiff
|
tree
2010-12-16
Junio C
H
a
mano
M
e
rge bran
c
h 'jn/submodule-b
-
current
'
commit
|
commitdiff
|
tree
2010-12-16
Junio C
Hamano
Merge br
a
nch 'j
n
/maint-
f
ast-import-
o
bject-reuse'
commit
|
commitdiff
|
tree
next