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
von Zweigbergk
merge
t
o
o
l: don't skip modify/remov
e
conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-16
M
a
rtin
von Zweigberg
k
rerere
"
r
emaining"
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
Junio C Haman
o
M
erge bran
c
h 'ma
i
nt' to syn
c
w
i
th 1
.
7
.
3
.
5
commit
|
commitdiff
|
tree
2011-01-05
Junio C Hamano
Git
1
.
7
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-05
Jun
i
o C
Hamano
Merge br
a
nch 'j
n
/svn-fe' (e
a
rly part
)
commit
|
commitdiff
|
tree
2011-01-05
Junio C Hamano
Mer
g
e bran
c
h '
a
o/t9001-fix
'
commit
|
commitdiff
|
tree
2011-01-05
Junio
C H
a
mano
Merge b
r
anch 'pw/convert-pathname-substi
t
ution'
commit
|
commitdiff
|
tree
2011-01-05
Junio C
H
amano
Merge branch 'mg/
c
vs
i
m
p
ort'
commit
|
commitdiff
|
tree
2011-01-04
Antonio Ospite
t/t9001-send
-
em
a
il
.
s
h: fix
'
&&
'
chain in s
o
me tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-04
Michae
l
J Gruber
cvsi
m
port: handle t
h
e parsing of uppercase 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
J
unio C Hamano
M
e
rge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2011-01-04
Jonathan Nieder
da
e
mon: sup
p
ort <
d
irec
t
o
r
y
> arguments agai
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-04
Ralf Wildenhues
Fix typos in
t
h
e documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-04
Jo
n
atha
n
Nieder
gitweb: skip lo
g
o
in atom feed w
h
en the
r
e is n
o
ne
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-29
Ro
b
in H
.
Johnson
t9001:
F
i
x te
s
t prere
q
uisites
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-28
Junio C H
a
ma
n
o
Git 1
.
7
.
4-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-28
J
unio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-12-28
Junio C
Ha
m
ano
P
repare f
o
r 1
.
7
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-28
Junio C Haman
o
M
er
g
e br
a
nch 'jk/c
o
mmit-die-on
-
bogus-ident'
i
nto m
a
in
t
commit
|
commitdiff
|
tree
2010-12-28
J
u
nio C Haman
o
Mer
g
e bra
n
ch 'ks/bl
a
me-wo
r
ktree-textconv-cached' into
.
.
.
commit
|
commitdiff
|
tree
2010-12-28
Junio
C
Hamano
Mer
g
e bra
n
ch 'jc/ma
i
nt-rebase-r
e
write-last-skip' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-12-28
Junio C
Ham
a
n
o
Merge branch 'jc
/
m
aint-am-a
b
ort-saf
e
ly'
i
nto m
a
int
commit
|
commitdiff
|
tree
2010-12-28
Juni
o
C Haman
o
Merge branch 'kb
/
maint-status-c
q
uote' i
n
to
m
aint
commit
|
commitdiff
|
tree
2010-12-28
Brandon Cas
e
y
t9001
:
use o
l
der Getopt::
L
ong boolean prefix '--no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-28
Jun
i
o
C Hama
n
o
M
erg
e
branch
'jc/maint-rebase-rewr
i
te-last-skip'
commit
|
commitdiff
|
tree
2010-12-28
Ju
n
io C
Hamano
M
erg
e
b
r
anch
'nd/setup'
commit
|
commitdiff
|
tree
2010-12-28
Robin H
.
Joh
n
son
Fix false posit
i
ves in t3404 due to
SHELL=/bi
n
/fals
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-27
N
guyễn
T
hái Ngọc Duy
setup_work_tree:
a
djus
t
relative $GIT_WORK_TREE
after
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-26
Jun
i
o
C
Hama
n
o
Merge b
r
anc
h
'rs/maint-diff-f
d
-leak' into ma
i
nt
commit
|
commitdiff
|
tree
2010-12-26
René Scharfe
c
l
ose f
i
le on error in read_m
m
file(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-23
Junio C
Haman
o
Merge bran
c
h 'rj
/
maint-difft
o
ol-cygwin-
w
orkaround'
commit
|
commitdiff
|
tree
2010-12-23
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-12-23
Bran
d
on Cas
e
y
Makefile: add
N
O_
F
NMATCH_CASEFOLD to IRIX sections
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-23
Brandon Casey
test-lib
.
sh/test_decode_color(
)
:
use octal not he
x
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-23
Junio C Hama
n
o
reba
s
e --skip: co
r
rect
l
y wrap-u
p
when
s
kipping
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Junio C Hamano
t00
2
1: av
o
id gett
i
ng filter killed
wi
t
h SIGPIPE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Junio
C
Hamano
M
erge bra
n
ch 'rj/ma
i
nt
-
test-fixes'
commit
|
commitdiff
|
tree
2010-12-22
Junio
C Hamano
Merg
e
branch
'
jc/maint-am-abor
t
-safely'
commit
|
commitdiff
|
tree
2010-12-22
J
u
nio C
H
ama
n
o
M
e
rge branch 'jk/c
o
mmit-die-on-b
o
g
u
s-ident'
commit
|
commitdiff
|
tree
2010-12-22
Ju
n
i
o
C Ham
a
n
o
Merge branch 'pd/bash-4-co
m
pletion
'
commit
|
commitdiff
|
tree
2010-12-22
Junio C Hamano
M
erge branch 'nd/maint-
f
ix-
a
dd-typo-detection'
commit
|
commitdiff
|
tree
2010-12-22
Jun
i
o C Hamano
M
e
rge branch 'tf/commit-list-
p
refix
'
commit
|
commitdiff
|
tree
2010-12-22
Ngu
y
ễn Thái Ngọc Duy
git
.
tx
t
: c
o
rre
c
t whe
r
e --wo
r
k-tree
path
i
s relative to
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn Thái Ngọ
c
Duy
Revert "Documentation: always respect cor
e
.
wor
k
tree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
J
onathan Nieder
t
0
001: test git init when run via an alia
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Ng
u
y
ễ
n
T
h
ái Ngọc D
u
y
Remo
v
e
all logic from get_git_w
o
rk_tree()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Nguy
ễ
n
Thá
i
Ngọc Du
y
set
u
p: r
e
w
o
rk set
u
p_explicit_g
i
t_dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn Thái Ngọc
D
uy
setup: cl
e
an up setup_discovered_git_d
i
r()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Michael
J
Gruber
t1020-subd
i
rectory: test alias expansion in a
subdirectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Nguy
ễ
n
T
hái Ngọc Duy
setu
p
:
c
lean up
setup_bare_
g
i
t
_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: limit get_git_work
_
t
ree()'s t
o
explicit set
u
p
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Ngu
y
ễn
T
hái Ngọc
D
uy
Use
git_c
o
nfig_early()
i
nstead of
g
it_config() dur
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
N
guyễn Th
á
i Ngọc Duy
Add
g
i
t_config
_
early()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-22
Pete Wyckoff
convert filter:
su
p
ply path t
o
ext
e
rnal driv
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-21
Junio
C
H
a
mano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-12-21
Junio C Hama
n
o
Mer
g
e
branch 'ks/b
l
ame-
w
orktree-textconv-cac
h
ed'
commit
|
commitdiff
|
tree
2010-12-21
Junio C Haman
o
Merg
e
bran
c
h
'
jk/t2107-now-pa
s
s
e
s
'
commit
|
commitdiff
|
tree
2010-12-21
Jun
i
o
C
Hamano
M
e
rge
b
r
a
nch 'jk/
m
ain
t
-decorate-01-b
o
ol'
commit
|
commitdiff
|
tree
2010-12-21
Junio C Ham
a
no
Me
r
g
e
bran
c
h
'
tc/completion-refl
o
g
'
commit
|
commitdiff
|
tree
2010-12-21
Junio C Hamano
Merge branc
h
'
n
d/oneli
n
e-sha1-n
a
me-from-specific-
r
e
f
'
commit
|
commitdiff
|
tree
2010-12-21
Junio C Hamano
Me
r
ge branch 'jn/maint-gi
t
web
-
pathinfo-fix'
commit
|
commitdiff
|
tree
2010-12-21
J
o
nathan
N
i
eder
t0050: fix printf f
o
rmat st
r
i
n
g
s f
o
r portability
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-21
Ramsay Jone
s
t3
4
19-*
.
sh: Fix arithmetic expansi
o
n syntax er
r
or
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-21
J
unio C Hamano
am
--abort: keep unrelated commits since the last failur
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-21
Junio C
Hamano
set
_
t
r
y_to_fr
e
e_routine(NULL)
m
eans "do noth
i
ng spe
c
ia
l
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-21
Junio C
H
amano
commit: die before asking to edit
t
he
l
og message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-21
Martin vo
n
Z
weigbergk
c
o
mpletion
:
add missing
configuration variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-20
Jeff King
ident: die on bog
u
s date format
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-20
Kiri
l
l
S
mel
k
ov
fill_textco
n
v(
)
: Don
'
t
get/put
cac
h
e if sha1 is not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-20
Kirill Smelkov
t/t
8
006: Demonstra
t
e blame is
broken when cachetext
c
onv
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-20
Jun
i
o C Hamano
Mer
g
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-12-19
J
o
nathan Ni
e
der
t9300
:
use perl "
h
ead -
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:
m
ark pas
s
ing test
as succe
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-19
Jeff King
handle ar
b
i
tra
r
y ints in git_co
n
fig_maybe_bool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-19
Thiago Fa
r
ina
bu
i
ltin/rm
.
c
:
Use AL
L
OC
_
GROW instead of all
o
c_nr and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-19
Thi
a
go
Farin
a
builtin/branch
.
c:
U
se
A
LLOC_G
R
OW ins
t
e
a
d
o
f alloc_nr
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-19
Jak
u
b Narebski
gitweb:
Inc
l
u
d
e lin
k
s
to feed
s
i
n
HTML header
o
nly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-19
Ma
r
k Lodato
fs
c
k docs: remov
e
o
u
tdated and useless
d
i
a
g
nostic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-19
Thomas Rast
use
r
diff
:
fix typo
i
n
r
u
by
a
nd python wor
d
r
egexes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-17
V
a
s
yl' V
a
vrychuk
trace
.
c:
m
ark
file-loc
a
l function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-17
Tay Ray
C
huan
bash completion:
a
dd basic support for git-r
e
flog
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-17
Jiang
X
in
Fix
t
ypo in git-gc documen
t
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-17
Juni
o
C Hamano
Update draft
r
elease notes t
o
1
.
7
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-17
Junio
C
Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-12-16
N
guyễn
T
hái Ngọc Duy
get_sha1: handle special c
a
se $commit^{/}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-16
M
ichae
l
J Gr
u
ber
difftool: provide basename to
external tools
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-16
Michael
J Gru
b
er
git
-
difftool
.
t
x
t: correct the descri
p
tion of $BASE
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-12-16
J
u
nio C Hamano
Merge b
r
anch 'kb/diff-C-M-synonym'
commit
|
commitdiff
|
tree
2010-12-16
J
u
nio C Hamano
Merge branch 'jn/fast-impor
t
-blob-a
c
ces
s
'
commit
|
commitdiff
|
tree
2010-12-16
Junio C Hamano
Merge branch '
j
l/fetch-submodule-recurs
i
ve'
commit
|
commitdiff
|
tree
2010-12-16
Junio C Ham
a
n
o
Merge br
a
n
c
h 'r
j
/msvc-fix'
commit
|
commitdiff
|
tree
2010-12-16
Junio C Hamano
Merge branch 'nd/extende
d
-s
h
a
1-relpath'
commit
|
commitdiff
|
tree
2010-12-16
Junio C
Hamano
Merge
branch
'
aa/
s
t
a
tus-hilite
-
bran
c
h'
commit
|
commitdiff
|
tree
2010-12-16
Junio
C
Hama
n
o
M
erge b
r
a
n
ch
'
ak/desc
r
ibe
-
exact'
commit
|
commitdiff
|
tree
2010-12-16
Junio C H
a
m
ano
M
erge branch
'
n
d
/
maint-re
l
ative'
commit
|
commitdiff
|
tree
2010-12-16
Juni
o
C Hama
n
o
M
e
rge
b
r
anch 'jn/maint-
s
vn-fe'
commit
|
commitdiff
|
tree
2010-12-16
J
unio C Hamano
Mer
g
e bran
c
h
'jc/maint-s
v
n-
i
n
f
o
-
test-fix'
commit
|
commitdiff
|
tree
2010-12-16
Junio C Hamano
Merge b
r
anch 'jn/submodule-b-cur
r
ent'
commit
|
commitdiff
|
tree
2010-12-16
Juni
o
C
H
amano
M
erge branch 'jn/mai
n
t-fast-import-o
b
ject-reuse'
commit
|
commitdiff
|
tree
next