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
git status --ignored: tests and docs
2010-03-25
S
t
ephen Boyd
fmt-merge-msg:
u
se pretty
.
c ro
u
tines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Stephen B
o
yd
t6200: test fmt-merge-msg more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Stephe
n
Boyd
t6200: modernize with tes
t
_tick
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Step
h
en B
o
yd
fmt-merge-msg:
b
e
q
ui
e
t if nothing to merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Junio C H
a
mano
diff
--check: honor c
o
nflict-marker-
s
ize att
r
i
b
ute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
J
u
n
i
o C
Haman
o
Me
r
ge
b
ranch 'j
h
/maint-submodule-sta
t
us-in-void'
commit
|
commitdiff
|
tree
2010-03-24
J
u
nio C Hamano
M
erge branch 'tr/not
e
s
-disp
l
a
y'
commit
|
commitdiff
|
tree
2010-03-24
Junio C H
a
mano
Merge branch
'jl
/
subm
o
dule
-
diff
-
dirtiness'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Haman
o
Merge bra
n
c
h 'pb/log-first-parent-p-m'
commit
|
commitdiff
|
tree
2010-03-24
Jun
i
o
C
H
amano
Me
r
ge b
r
anch 'jc/maint-refs-danglin
g
'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
M
e
rge
b
ranch
'jc/color-attrs' int
o
maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge branch
'
j
k/maint-add-igno
r
ed
-
dir'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io C Hamano
M
e
r
ge
b
ran
c
h 'bg/app
l
y-fix
-
blank-at-eof' into
maint
commit
|
commitdiff
|
tree
2010-03-24
Marc Branchaud
T
e
ach reb
a
se
t
he --no-ff
optio
n
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Shawn O
.
Pe
a
rce
http-backe
n
d: Don't in
f
ini
t
e lo
o
p during die(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
R
.
Ty
l
er Ballance
Co
r
rect
r
eferences to /usr/bin
/
p
y
thon
which d
o
e
s
not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Markus H
e
idelberg
Do
c
u
m
entation: e
x
plain the
m
eaning
o
f
"-g" in git-
d
escribe
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Michael J Gruber
rev-list: use default abbre
v
lengt
h
when abbr
e
v-comm
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
R
a
mkumar Ramac
h
a
ndr
a
imap-send:
R
emove limitation on mes
s
ag
e
body
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hamano
S
ync with G
i
t 1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hamano
Git 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
Ju
n
io C Hamano
Merge branc
h
'maint-1
.
6
.
6' into maint
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
.
m
a
i
lma
p
: Map
t
he the
first submiss
i
o
ns of MJG by e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
E
rik Faye-L
u
nd
ls: remove
r
edundant
l
ogic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-Lund
cherr
y
: support --ab
b
rev
opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael
J
Gr
u
ber
Documentatio
n
/gi
t
-clone
:
Tra
n
sform de
s
cr
i
ption list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
M
ichael J Gruber
Docum
e
nt
a
tion/urls: Remov
e
spurious exa
m
ple m
a
rkers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Micha
e
l J Gruber
D
ocu
m
e
n
tation/gi
t
d
i
f
fcore: Rem
o
ve mi
s
leading
date i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Mic
h
ael J G
r
u
ber
Do
c
ume
n
ta
t
i
on/g
i
t-r
e
flog: Fix forma
t
ting of command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik F
a
ye-Lun
d
r
ev
-
list:
f
ix --
p
retty=oneline
w
ith empty
m
essag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan N
i
e
d
e
r
m
e
rge-recu
r
s
i
ve: add a labe
l
for an
c
esto
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
c
herry-pick
,
revert: add a labe
l
for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
revert: clar
i
fy
l
a
bel o
n
con
f
lict hunks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
compat:
a
dd
m
empcpy()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
ona
t
han Nieder
check
o
ut -m --conflic
t
=dif
f
3
:
add
a label fo
r
ances
t
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
m
e
r
ge_trees
(
):
a
dd ancestor
l
abel
p
ar
a
me
t
er
for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_
f
il
e
():
add comme
n
t explaining behavior wrt
c
onflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
a
tha
n
N
i
eder
checkout
-
-
conflict=di
f
f3
:
add a lab
e
l
for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
l
l
_
m
erge(): add ancestor label parameter
f
or diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
merge-file
--diff3: add a
label for ancest
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
x
dl_m
e
r
ge(): move file1 a
n
d fil
e
2 lab
e
ls to
x
m
param
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Ni
e
der
x
dl_merge(): add
optional ancestor l
a
bel t
o
di
f
f3-s
t
y
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
i
eder
t
e
s
t
s: document che
r
r
y
-
pick be
h
avior in fac
e
of conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
t
ests: document form
a
t of con
f
licts
fr
o
m checko
u
t -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
.
mailmap:
Ent
r
ies for A
l
ex Benn
é
e, Deskin M
i
ller
,
Vitaly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
revert
:
f
ix
tiny memory le
a
k
i
n cherry-pick --ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
J
unio C Ham
a
no
Update draft release
n
ote
s
to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Hamano
Merge
b
ranch
'
jk/maint-add-ignored-dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
Hamano
Merge branch 'ml/color-grep'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Hama
n
o
Merge
b
ranch 'jc/color-attr
s
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Mer
g
e branch '
c
c/reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
io
C
Hamano
Merge
branch
'f
l
/askpa
s
s'
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
mano
M
erge branch 'b
g
/apply
-
fix-
b
lank-at-eof'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C
Hamano
Me
r
ge branc
h
'bw/u
n
ion-me
r
ge-refact
o
r'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ha
m
a
n
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-03-20
J
u
ni
o
C
Hamano
Update draft rele
a
se
n
o
t
es to 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Chris
t
ian Co
u
der
r
ebase
-
i
:
use new -
-
ff ch
e
rry-pic
k
opt
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andrea
s
Gruenba
c
her
fetch:
Fix minor
m
emory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
An
d
re
a
s
G
ruenbache
r
f
etch:
Futur
e
-proof initialization of a re
f
s
pe
c
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andrea
s
Gruenbacher
fetc
h
: Chec
k
fo
r
a "^{}"
suffix wit
h
s
uffixcmp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Benjamin C Meyer
Fix a spellin
g
mistake in a git-p4 console message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Bri
a
n Gern
h
ardt
U
s
e test_expect
_
succes
s
f
or t
e
s
t
s
etups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Ben
Wa
l
ton
Mode
r
n
ize git calling conve
n
tions in h
o
o
k
temp
l
ates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Be
n
Walton
M
a
ke templates honour S
H
ELL_PATH and PE
R
L_PAT
H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Imre Deak
d
a
emon: p
a
rse
_
h
ost_and_port S
I
GSEGV if port is spec
i
fied
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
J
o
nathan
N
ieder
Mak
e
file: Fix occa
s
io
n
al GIT-CFL
A
G
S br
e
akage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
Ma
k
efile: Fix
C
DPATH problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brandon Casey
t/
t
55
0
5
-r
e
mote
.
sh: e
s
c
ape
*
t
o prevent interp
r
etat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
r
andon C
a
sey
t5505:
add missing &&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brandon Casey
t
5
5
05: remove unnecessary subshell invocations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Bran
d
on Casey
n
o
tes
.
c:
remove
i
n
appropriate call to return
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
St
e
phen Boyd
pull: replace unnecessary sed invocatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-17
T
hom
a
s R
a
st
Doc
u
ment
a
tion: receive
.
denyCurr
e
ntBranch defaults to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Ian Ward Comfort
bash: c
o
mplete *_HEAD r
e
fs
i
f p
r
e
s
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Haman
o
Merge
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-03-17
Anders Kaseorg
everyday: fsck and gc
are n
o
t everyda
y
oper
a
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
G
u
staf Hendeby
Improve err
o
r
messages from 'g
i
t sta
s
h s
h
ow'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
B
ran
d
o
n Casey
daemon
.
c:
a
v
o
id accessing ss_fami
l
y mem
b
er of st
r
uct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
t/t1304: make a second colon optio
n
a
l
in the mask
A
CL
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
t/t1
3
0
4
: set the ACL
e
f
f
ective rights mask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Brandon
C
asey
t/t1304: use 'te
s
t -r' to tes
t
readabili
t
y
rather th
a
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
B
randon Casey
t/t1304: se
t
the
D
efault AC
L
base entri
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Bran
d
on Cas
e
y
t/t1304: avoid -d op
t
ion to setfacl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-16
J
u
nio C
H
amano
refs: ref entry wi
t
h NULL s
h
a1
is
ca
n
b
e
a dangling
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
René Schar
f
e
grep: enable thre
a
din
g
for
context line
printin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gruber
Docum
e
ntation/
g
i
t
-rea
d
-
t
re
e
: clarify 2-tre
e
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michael J
G
r
ube
r
Docume
n
tation/
g
it
-
r
e
ad-t
r
ee: fix t
a
ble l
a
yout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
J
u
nio
C H
a
mano
Merg
e
branch 'sd/format-
p
a
t
ch-to'
commit
|
commitdiff
|
tree
2010-03-15
Junio C
Hamano
Merge branc
h
'tc/http-cleanup
'
commit
|
commitdiff
|
tree
2010-03-15
J
unio
C
Hamano
M
erge branch 't
c
/
t
ransport
-
verb
o
sity'
commit
|
commitdiff
|
tree
2010-03-15
J
unio C Hamano
Merge
branch 'ld/pu
s
h
-por
c
el
a
in
'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge branc
h
'jh/notes'
commit
|
commitdiff
|
tree
2010-03-15
Dave Olszewsk
i
rebase--in
t
eractive: don't require w
h
at's
r
ebased to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jari Aalto
git-
s
end-
e
mail
.
pe
r
l - try to give real n
a
me of
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jar
i
Aalto
git-send-email
.
perl: add option --smtp-debug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jari Aalt
o
gi
t
-send-
e
m
a
il
.
perl: improve erro
r
messa
g
e in send_
m
essa
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Ju
n
io C
H
am
a
no
tests for "git ad
d
ignor
e
d
-dir/file" withou
t
-f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jeff King
dir: fi
x
COLL
E
CT_IG
N
O
R
ED on excluded
prefixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next