repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
tests: document cherry-pick behavior in face of conflicts
2010-03-21
J
onathan Nieder
tests: document cherr
y
-pi
c
k behavior in f
a
c
e of confl
i
cts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Niede
r
tests: document format
of conflicts
f
rom
c
heckout -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Haman
o
Update draft release notes to
1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
M
erge branch
'jk/main
t
-add-ignored-dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
a
m
ano
Mer
g
e
b
ranch
'
ml/color-grep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
no
Merge branch 'jc/color-at
t
rs'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
no
Merge br
a
nch 'cc/r
e
set-keep
'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C Hamano
Mer
g
e branch 'fl/
a
skpass
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Haman
o
Merge br
a
nch 'bg/apply-fix-blank-at
-
eof'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o
C Haman
o
Merg
e
b
ranch 'bw/union-mer
g
e-refactor'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
amano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C Hamano
Update draft
r
e
lease
n
o
te
s
to 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruenbacher
fetch:
F
i
x mi
n
or memory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas
G
ruenbacher
fetch
:
F
u
ture-
p
r
o
o
f
i
nitialization of a refspec on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gr
u
e
n
bacher
fetch: Check
for a "^{
}
" suffix with suffixcm
p
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Be
n
jamin C M
e
yer
Fi
x
a spelli
n
g mis
t
ake
i
n a git-p4 console message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Bri
a
n
G
e
rnhardt
Use t
e
st_expect_succes
s
f
o
r test setups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Imre De
a
k
d
a
em
o
n: parse_host
_
and_port
S
IGSEGV if
p
ort is speci
f
ied
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
M
a
kef
i
le: F
i
x occasional GIT-CFL
A
G
S
breakage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jo
n
athan Nieder
Makefile: Fix CDPATH proble
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brandon Cas
e
y
no
t
es
.
c: remove inap
p
ropriate call
t
o
return
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Stephen Boyd
pull
:
replace unnecessary sed invocation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio C H
a
man
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-03-17
Thomas Rast
Documentation:
r
eceive
.
denyCur
r
en
t
Br
a
nch
d
efau
l
ts
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Ian
Ward Co
m
fort
bash: complete *_HEAD
r
ef
s
if
p
rese
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio
C
Ham
a
n
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-03-15
Michae
l
J Gruber
D
o
cu
m
e
nta
t
ion/
g
it-r
e
ad
-
tree: clari
f
y
2
-tree
m
erge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gruber
Documen
t
ation/git
-
re
a
d-tree: fix table layout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Junio C Ha
m
ano
Merge branc
h
'sd/fo
r
mat-pat
c
h-to'
commit
|
commitdiff
|
tree
2010-03-15
Ju
n
io C
Hamano
Mer
g
e b
r
anch
'tc/http-cleanup'
commit
|
commitdiff
|
tree
2010-03-15
Jun
i
o
C Hamano
M
e
rge branch 'tc/trans
p
ort
-
verbosity'
commit
|
commitdiff
|
tree
2010-03-15
Ju
n
io C
Hamano
Merge
bra
n
c
h
'ld/push-porcel
a
in'
commit
|
commitdiff
|
tree
2010-03-15
J
u
nio
C
Hamano
Merge branc
h
'
jh
/
notes'
commit
|
commitdiff
|
tree
2010-03-14
J
unio C Hamano
tests for "git add
i
gnored-
d
ir/fi
l
e" without -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jeff Kin
g
dir: fix COLLE
C
T_IGNORED on excluded
p
refixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jun
i
o
C H
a
mano
t0050: mark non-
w
orki
n
g
test as such
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-14
Dave Olszewski
d
o
n
't u
s
e default r
e
v
i
s
i
on if a re
v
was sp
e
c
i
f
i
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
René
S
charfe
for_each_rec
e
nt_re
f
l
og_
e
nt(): use strbuf, fix offset
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Jun
i
o
C
H
amano
t/Makefile: rem
o
ve te
s
t
art
i
f
acts
upon "mak
e
clean"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
René
S
c
harfe
bl
a
me: fix indent
of line
n
u
m
b
ers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Ha
m
ano
M
e
r
ge git://git
.
bog
o
mi
p
s
.
org/git-svn
commit
|
commitdiff
|
tree
2010-03-13
J
u
nio
C
H
amano
Merge bra
n
c
h
'
maint'
commit
|
commitdiff
|
tree
2010-03-12
Junio C Hamano
t5516:
Use tes
t
_cm
p
when appropr
i
a
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
Junio
C
H
amano
t9400:
U
se test
_
cmp when appropriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
M
e
rge b
r
anch 'sd/in
i
t-
t
emplate'
commit
|
commitdiff
|
tree
2010-03-10
Ju
n
io C Hamano
Merge branch
'
sh/am
-
keep-cr'
commit
|
commitdiff
|
tree
2010-03-10
Junio
C
Hamano
Merge branch 'cp/add-
u
-paths
p
e
c
'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
Makefile: update che
c
k
-d
o
cs
target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Junio C Ham
a
no
Merge b
r
anc
h
'lt/deepen-bui
l
tin-s
o
urce'
commit
|
commitdiff
|
tree
2010-03-09
Junio
C
H
amano
Documen
t
ation: im
p
rove
descri
p
tio
n
of "git
r
ese
t
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Step
h
en Boy
d
send-
e
ma
i
l: add --
n
o
-
cc
,
--no-to, an
d
--no-bcc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boyd
fo
r
m
at-patch
:
a
dd --n
o
-cc, --no-to
,
and --
n
o-a
d
d-
h
eaders
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Stephen B
o
yd
fo
r
mat-p
a
tch: use
a str
i
ng_list
for hea
d
er
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio C Hama
n
o
Update draft rel
e
ase
n
otes
t
o 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Ham
a
no
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-08
Junio
C Hamano
Merge accumulated fix
e
s
t
o
prepare
f
or 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
io C
Hamano
Merge bran
c
h 'mw
/
maint-gcc-w
a
rns-unused-wri
t
e' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch 'fn
/
maint-mkdtemp-compat' into maint
commit
|
commitdiff
|
tree
2010-03-08
J
uni
o
C Ham
a
n
o
Merge branch '
g
b/maint-su
b
module-en
v
'
into maint
commit
|
commitdiff
|
tree
2010-03-08
Juni
o
C
Hamano
Mer
g
e br
a
nch 'as/ma
i
nt-expire' into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
erge b
r
a
nch 'm
l
/
m
aint-
g
rep-doc' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o
C
Ham
a
no
Me
r
ge
b
r
anch 'jk/maint-push
-
tracking-wo-r
e
mote' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C
H
amano
Merge branch 'jc/fetch-param' into m
a
int
commit
|
commitdiff
|
tree
2010-03-08
J
unio C Hamano
Mer
g
e br
a
n
ch 'n
e
/pack-loc
a
l-doc' into
m
a
int
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch
'jk/maint-add--interactive-
d
elet
e
' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
J
u
ni
o
C Ham
a
n
o
Merge
branch 'mm/m
k
stem
p
s
-
m
ode-for-pac
k
fil
e
s' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C Ha
m
ano
Merge branc
h
'jc/maint-
f
ix
-
mai
l
in
f
o-stri
p
'
into m
a
int
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
e
rge
b
ranch
'
jc/grep-author-all-mat
c
h
-
impl
i
cit' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branc
h
'jc/ch
e
ckout-detac
h
ed' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o
C Hamano
Merge
b
r
anch
'maint-1
.
6
.
6
'
int
o
m
aint
commit
|
commitdiff
|
tree
2010-03-08
M
ark Lodato
grep:
Colo
r
ize selected, c
o
n
t
e
x
t,
and function li
n
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Mark Lodato
grep:
C
olorize filename,
line n
u
mber,
and separator
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hama
n
o
Mer
g
e branch 'jc/maint-fix-test-perm' in
t
o maint-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'sp/
m
aint-push-sideband' into
m
aint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge br
a
n
ch 'hm
/
mai
n
t
-
imap
-
send-c
r
lf' into maint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
n
i
o
C
H
a
m
ano
Me
r
g
e
branch 'gf/maint-sh-setup-nongit-ok'
into
m
ai
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Hamano
Merge br
a
nch 'j
k
/
m
aint
-
rmdir-fi
x
' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C H
a
man
o
Merge
b
ranch 'rs/
o
ptim-text-w
r
ap'
i
nto maint-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ham
a
n
o
Merge branch
'
tr/maint-
c
h
erry-p
i
ck-l
i
st' into main
t
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
e
rge branch 'cc
/
m
a
i
n
t
-bisec
t
-paths' into ma
i
n
t-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C Hama
n
o
Merge bra
n
c
h 'mw/maint-gcc-warns-unused-w
r
it
e
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ha
m
a
no
Merge
bran
c
h
'as
/
maint-exp
i
re
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Mer
g
e branch 'ml/mai
n
t-grep-doc'
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C
H
a
ma
n
o
Me
r
ge branch 'fn/maint-mk
d
temp-compat'
commit
|
commitdiff
|
tree
2010-03-07
Junio C H
a
mano
Merge branch 'gb/maint-submodule-env'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
amano
Merge branch 'ne/pack-local-do
c
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ha
m
ano
Merge branch '
m
b/
s
hortlog-nongit-stdin'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
e
rge
b
ranch 'jk
/
maint-push-track
i
n
g
-wo-remote'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Mer
g
e b
r
anch
'jc/fet
c
h
-
param'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Haman
o
Merge branch 'il/loosen-remo
t
e-h
e
lpe
r
-names'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ha
m
a
no
Merge bra
n
ch 'nd
/
root-git'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
aman
o
Merge branch
'
js/
r
un
t
ime-pre
f
i
x-trace-not-
w
arn'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Hama
n
o
Merge br
a
n
c
h
'm
m
/mkstemps-mode-for-pack
f
iles'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ham
a
no
Merg
e
branch
'jk
/
ma
i
nt-add--inte
r
a
cti
v
e-delete'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Hamano
Merge bra
n
c
h '
j
c/
m
ain
t
-fix-mailinfo
-
strip'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
colo
r
:
allow m
u
ltiple attr
i
butes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hama
n
o
Sync
w
ith 1
.
7
.
0
.
2
commit
|
commitdiff
|
tree
2010-03-07
Mar
k
Loda
t
o
Add GIT_
C
OLOR_BOLD_* and GIT_CO
L
OR
_
BG_*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Hamano
Git
1
.
7
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next