repo.or.cz
/
git
/
wpalmer.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
Jo
n
athan Nieder
xdl_merge():
a
d
d optional ancestor
label to diff3-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
t
e
s
ts:
d
o
c
ument cher
r
y-pick behavior i
n
face o
f
c
onflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
tests:
doc
u
m
e
n
t format
of conflicts from checkout -m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Up
d
at
e
draft release notes
t
o
1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
mano
Me
r
g
e bra
n
ch 'jk/mai
n
t-add
-
ignored-d
i
r'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge
b
ra
n
ch 'ml/color-grep'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C
H
amano
Merge br
a
n
c
h 'jc/co
l
o
r
-
a
ttrs'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io
C Ha
m
ano
Merge branc
h
'cc/reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Me
r
ge
b
r
a
n
c
h
'fl/askpass'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Ha
m
ano
Merge bra
n
ch 'b
g
/
apply-fix-blank-at-e
o
f'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C Hamano
Merge branch 'bw/union-merge-re
f
actor'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Haman
o
Up
d
ate
d
raft
release
n
otes to 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
A
n
dreas Gru
e
nb
a
cher
f
e
tch: F
i
x mi
n
or memory leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
And
r
eas
G
ruenba
c
her
f
e
tch:
Fu
t
ure-proof
i
n
itializ
a
tion of a re
f
spec o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
And
r
ea
s
Gruenbacher
f
e
tch: Check fo
r
a
"
^{}" suf
f
ix with
suffixcmp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Benjami
n
C
Me
y
er
Fix
a
spelling
mist
a
ke in a git-p4 co
n
sole message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Bria
n
Gernhardt
Use tes
t
_expe
c
t_success for test setups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Imre Dea
k
daemon: parse_
h
ost
_
an
d
_
p
ort
S
IGSEGV if port
i
s specified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonat
h
an Nie
d
e
r
Makefile
:
Fix
occasional GI
T
-CFLA
G
S breakage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
o
n
athan Nieder
M
a
kefile:
Fix CDPA
T
H problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Bra
n
don Casey
notes
.
c:
r
emove inappropr
i
at
e
call to re
t
urn
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Stephen Boyd
pull: replace unnecessary se
d
invo
c
at
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Ju
n
io C Hama
n
o
Mer
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-03-17
Thomas Rast
D
o
cumentation: r
e
ceive
.
denyCur
r
entBranc
h
defaults
t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Ian Ward Comfort
ba
s
h:
c
o
m
plete *
_
H
EA
D
refs if prese
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio C
Hamano
Merge branch
'mai
n
t'
commit
|
commitdiff
|
tree
2010-03-15
Mi
c
h
ael J Gruber
Documentation/git-read-tr
e
e
: clarify 2-
t
ree m
e
r
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Mic
h
ael J Gruber
Documentatio
n
/git
-
read
-
t
r
ee
:
fi
x
table layo
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
M
er
g
e branch 'sd/format-patch-to'
commit
|
commitdiff
|
tree
2010-03-15
Junio
C
Hamano
Merge branch 'tc/http-clean
u
p'
commit
|
commitdiff
|
tree
2010-03-15
J
unio C Hamano
Merge branch 'tc
/
transpo
r
t
-
verb
o
sity'
commit
|
commitdiff
|
tree
2010-03-15
Jun
i
o C Hamano
M
erge b
r
anch 'ld/pu
s
h-porcelain'
commit
|
commitdiff
|
tree
2010-03-15
J
unio C Hamano
M
e
rge branch 'jh/n
o
tes'
commit
|
commitdiff
|
tree
2010-03-14
Junio C Hamano
tests for "git add i
g
nored-di
r
/file" without -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Jeff King
dir: fix COL
L
E
CT_IGNORED on
e
x
cluded prefixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Hamano
t0050: mar
k
n
on-wor
k
ing
test as such
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-14
D
ave Olszewski
don't us
e
default
r
evision
if a rev
w
as specified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
René S
c
harfe
fo
r
_
e
ach_recent_reflog_ent(): use s
t
rbuf, fix offset
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
J
unio C Hama
n
o
t/Makefi
l
e:
remove tes
t
artifacts upon "make c
l
e
a
n"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
R
e
n
é
S
c
harfe
blame: f
i
x
indent
of li
n
e numbers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
J
unio C Hamano
Merge
g
i
t://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2010-03-13
J
u
n
io C
H
amano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-12
Jun
i
o
C Hamano
t5516: Use t
e
st_cmp whe
n
appropriate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-12
Junio C Hamano
t940
0
:
U
se
t
est_cmp whe
n
ap
p
ropri
a
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
Junio C
H
am
a
no
Merge bra
n
ch 'sd/init-template'
commit
|
commitdiff
|
tree
2010-03-10
Juni
o
C H
a
mano
Merge branch 'sh/am-keep-cr
'
commit
|
commitdiff
|
tree
2010-03-10
Junio
C
Hamano
Merge b
r
a
n
ch '
c
p/add-
u
-pathspe
c
'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Ham
a
no
Makefile: up
d
ate chec
k
-docs target
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
Junio C Ham
a
no
Merge branch 'lt/d
e
ep
e
n
-
builtin-source'
commit
|
commitdiff
|
tree
2010-03-09
Ju
n
i
o
C
Haman
o
D
o
cument
a
t
ion: improv
e
description
o
f
"git
r
es
e
t -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
S
tephen
B
o
y
d
send-e
m
ail: add
-
-no-cc,
--
n
o-to, and --no-
b
cc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
S
t
ephe
n
Boy
d
form
a
t-p
a
t
c
h: add --
n
o
-
cc
,
--no-to
,
and
-
-no-add
-
headers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boyd
f
o
rmat-patch: use a string_li
s
t
f
or hea
d
ers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
Ham
a
no
Up
d
ate draf
t
release notes to
1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C Hamano
Merge accumu
l
ated fixes to p
r
epare for
1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Mer
g
e b
r
anch 'm
w
/maint-gcc-warns-unused-write' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C
H
amano
Mer
g
e
branch 'fn/mai
n
t-mkdt
e
mp-compat' int
o
maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
e
rge
branch 'gb/maint-submodule-
e
nv' into maint
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
io C Hamano
Merge branch
'
a
s
/maint-
e
x
p
ire' into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
Hamano
M
e
rg
e
branch
'
ml/maint-grep-doc
'
into
m
aint
commit
|
commitdiff
|
tree
2010-03-08
Juni
o
C
H
amano
M
e
rge branch
'
jk/
m
aint-push-
t
racking-w
o
-remote
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
J
unio C Haman
o
Mer
g
e branch 'jc/f
e
t
c
h-param'
into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C
Ha
m
ano
Me
r
g
e branch 'ne/p
a
ck-local-do
c
'
into maint
commit
|
commitdiff
|
tree
2010-03-08
J
u
n
i
o C Ham
a
no
M
e
rge branch 'jk/maint
-
add--interactive-delete'
into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio C Hama
n
o
Merge
branch 'mm
/
mks
t
emps-mode-for
-
pac
k
files' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge b
r
anch 'jc/m
a
int-fi
x
-m
a
ilinfo-str
i
p' into maint
commit
|
commitdiff
|
tree
2010-03-08
J
unio
C
Hamano
M
e
rge bra
n
ch 'jc/
g
rep-author-all-ma
t
ch-implicit' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C
H
amano
Merge branc
h
'jc/
c
heckout-detac
h
e
d
' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
e
rge branch 'm
a
i
nt-1
.
6
.
6' into maint
commit
|
commitdiff
|
tree
2010-03-08
Mark Lodato
g
re
p
:
Co
l
ori
z
e select
e
d,
c
on
t
ex
t
,
an
d
functi
o
n lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Mark Lodat
o
grep: Colorize
f
i
lename, line number, and separator
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Hamano
Merge
branch 'jc/mai
n
t-fix-test-per
m
' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge
branch 'sp/maint
-
push-sideba
n
d
' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'hm/
m
aint-ima
p
-send
-
crlf' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
ni
o
C
Haman
o
Mer
g
e
b
ra
n
ch 'gf/maint
-
sh-setup-nongit-ok
'
i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ha
m
ano
Merge branch 'jk/maint-rmdir-f
i
x' into maint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
e
rge branch 'rs/opt
i
m
-
text-wrap' in
t
o
maint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C H
a
mano
Merge branch
'
tr/maint-ch
e
rry-pi
c
k-li
s
t' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Ham
a
no
Merge branc
h
'cc/maint-b
i
s
ect-pa
t
hs' into m
a
int
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Hamano
M
erge branch
'
mw/maint-gcc
-
warns-
u
nused-write'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Hamano
Merg
e
branch '
a
s/maint-expi
r
e'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ha
m
ano
M
e
r
ge branch 'ml/m
a
int
-
g
r
e
p-doc
'
commit
|
commitdiff
|
tree
2010-03-07
J
u
n
io C Hamano
Merge
branch 'fn/maint-mkdtemp-com
p
at'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io C
H
amano
Merge branch
'gb/maint-submodule-env'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C H
a
mano
Merge branc
h
'ne/pack-local-doc'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'mb/shortlog-nongit-
s
t
d
in'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hama
n
o
Merge
b
ranch 'jk/maint-push-tracking-wo-remo
t
e
'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C
Ham
a
no
Merge
b
ran
c
h 'jc/fetc
h
-param'
commit
|
commitdiff
|
tree
2010-03-07
J
u
n
i
o C
H
am
a
no
Merge br
a
nch '
i
l
/
l
oosen-remote-help
e
r-nam
e
s'
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio
C
Hamano
Merg
e
b
r
a
nch 'nd/root-g
i
t'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
a
man
o
Merge branch 'js/runtime
-
prefix-tr
a
c
e-not-wa
r
n'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
H
amano
Merge
bran
c
h 'mm/mkstemp
s
-mode-fo
r
-packfiles'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io C Hamano
Merge br
a
nch '
j
k/m
a
i
nt-add--in
t
e
ractive-
d
elete'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C
Hamano
Merge br
a
nch 'jc/maint-f
i
x
-m
a
ilinfo-
s
trip'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Hamano
color: allow multiple attribute
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Haman
o
Sy
n
c wi
t
h 1
.
7
.
0
.
2
commit
|
commitdiff
|
tree
2010-03-07
Mark Lod
a
t
o
Add GIT
_
C
OLOR_BOLD_* and
GIT_COLOR_BG_*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next