repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
xdl_merge(): add optional ancestor label to diff3-style output
2010-03-21
Jona
t
han N
i
e
d
er
xdl_merge(): add
op
t
ional
a
ncestor
l
a
b
el to di
f
f3-styl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan N
i
eder
t
e
sts: docume
n
t cherry-pick be
h
a
v
ior in f
a
c
e
o
f conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
t
e
s
t
s: docum
e
n
t format of
c
onfli
c
ts from
checkout -
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
H
a
mano
Update draft release n
o
tes
t
o 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branc
h
'jk
/
maint-
a
dd-ign
o
red-dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
no
Merge bra
n
ch
'
m
l/color-grep'
commit
|
commitdiff
|
tree
2010-03-20
J
unio
C Hamano
Merge bran
c
h 'jc/co
l
or-attrs'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge b
r
a
nch 'cc/res
e
t-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'fl
/
as
k
pass'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
amano
M
e
r
ge
bran
c
h 'bg/a
p
ply
-
fix-blank-at-eo
f
'
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio
C
Ham
a
n
o
Mer
g
e b
r
anch 'bw/u
n
ion-merge-r
e
factor'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io
C
Hamano
M
e
rg
e
b
r
an
c
h
'main
t
'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Hamano
U
p
date
d
ra
f
t
r
elease notes t
o
1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gru
e
nbacher
fetch: Fix m
i
nor memory leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Grue
n
bacher
fet
c
h: Future-proof initializatio
n
of
a
refspec on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gr
u
en
b
acher
fet
c
h
:
C
h
e
ck f
o
r
a "^{
}
"
s
uffix wit
h
suffixcmp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Benja
m
in C Meyer
Fix a spel
l
ing
mis
t
a
k
e i
n
a git-
p
4 conso
l
e mess
a
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Bria
n
Gernhard
t
Use te
s
t_exp
e
ct_
s
uccess
f
o
r
test setup
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Imre Deak
daemon: parse_host_
a
nd_port SIGSEGV if
port is specified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jona
t
h
a
n
Nieder
Makefi
l
e: Fix occ
a
siona
l
G
IT-CFLAGS brea
k
age
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonat
h
an Nieder
Ma
k
efile: F
i
x CD
P
AT
H
problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Bran
d
on Cas
e
y
notes
.
c
: remove
inapprop
r
i
a
te ca
l
l to
return
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Stephen Boyd
pull: replace unn
e
cessary sed invocation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Hamano
Merge br
a
nch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2010-03-17
Thomas Ras
t
Do
c
ument
a
t
ion: re
c
e
ive
.
d
en
y
Curr
e
ntBranc
h
defaults to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Ia
n
War
d
Comfort
bash: complete *_HEAD refs
i
f present
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Hamano
Merg
e
bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2010-03-15
Mi
c
hael J Gruber
Documenta
t
ion/gi
t
-
r
ead-t
r
e
e:
c
larify 2-tree merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Mi
c
h
a
el
J
Gruber
D
ocum
e
ntation/git
-
rea
d
-tree: fix
t
able layout
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Junio C Ham
a
no
M
erge branch 'sd/for
m
a
t-patch-to'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge bran
c
h 'tc/http-cleanup'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge branch 'tc/transport-verbos
i
t
y'
commit
|
commitdiff
|
tree
2010-03-15
Junio
C
Hamano
Merge bran
c
h 'ld/push-porcela
i
n
'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge branch
'
jh/not
e
s'
commit
|
commitdiff
|
tree
2010-03-14
Junio C Haman
o
tests for "git add i
g
n
o
red-dir/file" without -
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Jeff
King
dir: fix CO
L
LECT_IGNORED o
n
excluded pre
f
ixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
J
u
nio C Hamano
t0050
:
mark non-
w
orking test
a
s
such
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Ham
a
no
Me
r
ge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-03-14
D
ave
Olsze
w
s
k
i
d
on't us
e
de
f
ault revision if a rev was specifi
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
R
e
né Scharfe
for_each
_
recent_reflog_ent(): use
s
trbuf, fix offset
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Hamano
t/Makefile:
remove test artif
a
cts up
o
n
"
m
a
k
e
clea
n
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Ren
é
Scharfe
bl
a
me: f
i
x in
d
en
t
of line numbers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Hama
n
o
Merge
git://git
.
bogomips
.
o
r
g/gi
t
-svn
commit
|
commitdiff
|
tree
2010-03-13
Juni
o
C Hamano
M
e
r
g
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-03-12
Junio C H
a
m
a
no
t
5
516: U
s
e test_cmp
when approp
r
iate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-12
Ju
n
i
o
C Ham
a
no
t9400: Use tes
t
_
c
m
p
w
hen a
p
propri
a
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
Ju
n
io
C
Hama
n
o
M
erge branch 's
d
/init-template'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hama
n
o
Merge branc
h
'sh/am-k
e
e
p-cr'
commit
|
commitdiff
|
tree
2010-03-10
Juni
o
C Hamano
Merge
b
ranch 'c
p
/add-u-pat
h
s
p
ec'
commit
|
commitdiff
|
tree
2010-03-10
Jun
i
o C Hamano
Makefile: update check-docs ta
r
get
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
Junio C Haman
o
Mer
g
e b
r
anch 'lt/deepen-
b
uiltin-source'
commit
|
commitdiff
|
tree
2010-03-09
J
unio C Hamano
Documentation: imp
r
o
v
e descriptio
n
of
"git res
e
t -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
S
t
eph
e
n Boyd
send-email: add -
-
n
o-cc, --no
-
to, a
n
d --no-bcc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
S
tep
h
en B
o
yd
format-patch
:
add --
n
o-cc,
-
-no-to,
a
n
d --no-
a
dd-headers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boy
d
for
m
at-pat
c
h:
u
s
e
a st
r
ing
_
list for headers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
J
unio C Hamano
Update draft
release not
e
s to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
erge branch
'
m
aint'
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
Hamano
Me
r
ge accumula
t
ed fix
e
s to prepar
e
for 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch 'mw/maint-gc
c
-warns-unused-w
r
ite' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C
H
amano
Merg
e
branch 'f
n
/mai
n
t-mkdtemp-comp
a
t' into
maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge bra
n
c
h '
g
b/ma
i
nt-sub
m
odule-e
n
v' into m
a
in
t
commit
|
commitdiff
|
tree
2010-03-08
J
unio C Ham
a
no
Me
r
ge branch
'as/maint-expire'
i
nto
m
a
int
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
Hamano
M
e
rge branch 'ml/m
a
int-grep
-
doc' int
o
mai
n
t
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C Hamano
Merg
e
branch 'jk
/
maint-push-tracking-wo-rem
o
te' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Haman
o
Merg
e
b
r
anc
h
'
j
c/fetch-p
a
ram' into maint
commit
|
commitdiff
|
tree
2010-03-08
J
u
n
io C Hamano
Mer
g
e branch 'ne/pack-l
o
cal-doc'
i
nto
main
t
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hama
n
o
M
erge branch
'jk/mai
n
t
-
a
dd--
i
nteractiv
e
-delete' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Haman
o
M
erge branc
h
'mm
/
mkst
e
mps-mode
-
for-packfi
l
es
'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C
H
aman
o
Merg
e
branch 'jc
/
maint-fix-mailinfo-strip' into
maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch 'jc/grep-author-all-m
a
t
c
h-implicit' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Juni
o
C
Hamano
Merge bran
c
h
'jc/checkout-de
t
ached' into mai
n
t
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
H
a
m
ano
Merge branch 'm
a
int-1
.
6
.
6' into maint
commit
|
commitdiff
|
tree
2010-03-08
M
a
r
k Lo
d
ato
grep
:
Colorize selecte
d
,
context,
and
functi
o
n
lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
M
a
rk Lodato
grep:
Co
l
orize fi
l
ename,
l
i
n
e
number, and
s
eparator
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Me
r
g
e bran
c
h 'jc/
m
aint-fix-te
s
t-perm' in
t
o maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ham
a
no
Merge
branch 'sp/m
a
int-pu
s
h-sideband' into
maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ham
a
n
o
M
erge
b
r
a
n
ch 'hm/maint-im
a
p-se
n
d-crlf' into
maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
ama
n
o
Merge branch '
g
f/maint-s
h
-
setup-nongit
-
ok' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io C Ha
m
an
o
Merge br
a
nch '
j
k
/maint-rmdir
-
fix' into m
a
int-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C Hamano
Me
r
ge branch
'rs/optim
-
text
-
w
rap' into
maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'tr/
m
aint
-
c
h
e
rry-pi
c
k-list' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hama
n
o
Merge bra
n
ch 'c
c
/main
t
-bisect-paths' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'mw/
m
aint-gcc-warns
-
unused-wri
t
e
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ham
a
no
Merge branch 'as/maint-expi
r
e'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Haman
o
Merge
b
ranch 'ml/maint-grep-
d
oc'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'fn/
m
a
i
nt-m
k
dt
e
m
p-compat
'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
i
o
C Hama
n
o
Merge branch 'gb/main
t
-submodule-env'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
e
rge
b
ranch 'ne/
p
ack
-
local
-
doc'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io
C Hamano
Merg
e
b
ranch '
m
b/shortlog-nongit-stdin'
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
Merge
branc
h
'jk/main
t
-push
-
tracking-w
o
-remote'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C
Hamano
Merge branch '
j
c/fetc
h
-para
m
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C H
a
mano
Merge branch 'il/lo
o
sen-rem
o
te-he
l
per-na
m
e
s'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Ha
m
ano
Merge bra
n
ch 'nd/ro
o
t-
g
it'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Me
r
ge
br
a
nch 'js/runtime-prefix-trace-not
-
warn
'
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C Haman
o
Merge bra
n
ch 'mm/mkste
m
p
s
-mode-
f
o
r
-packfiles'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Ha
m
ano
Mer
g
e
branch '
j
k/maint-add--interactive-d
e
lete'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ham
a
no
Merge branch 'jc/ma
i
nt-fix-mailinfo-strip'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Haman
o
c
o
l
o
r
: allow mu
l
tiple attr
i
b
utes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Haman
o
Sync with 1
.
7
.
0
.
2
commit
|
commitdiff
|
tree
2010-03-07
Mar
k
Lod
a
t
o
Add GIT_COLOR
_
BOL
D
_* and G
I
T_COLOR_BG_*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next