repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/maint-reflog-expire-unreachable'
2010-03-28
Peter Collingb
o
ur
n
e
Implement the rmd
i
r_or_wa
r
n f
u
n
c
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Peter Colli
n
gbo
u
rne
G
e
neral
i
s
e the
unlink_o
r
_wa
r
n function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '--gui' when diff
.
gu
i
tool is un
c
o
n
figu
r
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Sv
e
rre Rabbelier
fast-expo
r
t: don't s
e
gfault when marks file c
a
nnot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Chris
Webb
imap-send: su
p
pres
s
warn
i
ng about c
l
earte
x
t passw
o
rd
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Michael J
G
ruber
send-e
m
ail:
l
a
z
ily a
s
sign edit
o
r
var
i
able
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Stephen B
o
yd
fmt-mer
g
e-m
s
g: hi
d
e sum
m
ary option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Stephen B
o
y
d
fmt-me
r
g
e-msg: remo
v
e
custom string_l
i
st implemen
t
a
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Stephen
B
oy
d
string-list: ad
d
unsorted
_
string
_
list_looku
p
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
St
e
phen Boyd
f
m
t
-
merge-msg:
u
s
e
pr
e
tty
.
c rou
t
i
nes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Step
h
en Bo
y
d
t
6200: test fmt-merge-msg more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
St
e
phe
n
B
oyd
t6200: mo
d
ernize with
test_tick
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Stephen B
o
yd
fmt-merge-
m
s
g
:
be quie
t
if nothing to mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Junio C
Hamano
dif
f
--check:
hono
r
confli
c
t-marker
-
size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Juni
o
C Hamano
Merge branch
'
jh/mai
n
t-sub
m
odule-stat
u
s-
i
n
-void'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Me
r
ge branch
'tr/notes-d
i
s
p
l
ay'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
M
er
g
e branch
'
jl/submodu
l
e-diff-dirtiness'
commit
|
commitdiff
|
tree
2010-03-24
Juni
o
C
H
am
a
n
o
Mer
g
e branc
h
'pb/log-fi
r
st
-
parent-p-m'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
H
amano
Merge
branch 'jc/maint-refs-
d
angling'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
Hamano
Merge b
r
anch
'm
a
int'
commit
|
commitdiff
|
tree
2010-03-24
Jun
i
o C Hamano
Merge b
r
a
n
ch 'jc/color-attrs' into maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge branch 'jk/maint-add-ignored-dir' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ham
a
no
Merge branc
h
'b
g
/apply-fix-blank-at-eof' in
t
o maint
commit
|
commitdiff
|
tree
2010-03-24
Marc Branchaud
Teach reba
s
e
the --no-ff op
t
io
n
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Shawn O
.
P
earce
http-
b
ack
e
n
d
: Don't infin
i
te loop
during d
i
e()
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
.
Tyler Bal
l
ance
Correct refe
r
ences to /usr
/
bin/pyt
h
on
w
h
i
ch does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Marku
s
Heidelberg
Documentatio
n
: e
x
pl
a
i
n the mean
i
ng
o
f "-g"
in git-describe
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Michael J G
r
uber
rev-list:
u
se default abbrev length when abbr
e
v-commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Ramkumar Ramach
a
nd
r
a
imap-send:
R
emove limitat
i
on
on message body
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hamano
Sync with Gi
t
1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
Jun
i
o
C
H
amano
Git 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Jun
i
o C
H
ama
n
o
Merg
e
branc
h
'
m
a
i
n
t-1
.
6
.
6' in
t
o
m
aint
commit
|
commitdiff
|
tree
2010-03-21
M
ichael J Grub
e
r
.
ma
i
lmap: Map the the first s
u
bmissions of MJG by e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
E
ri
k
Faye-Lund
ls: remove r
e
dundant logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-Lund
c
herry: supp
o
rt --abbr
e
v
o
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Mich
a
el J Gruber
Docume
n
tation/gi
t
-c
l
one:
Transform de
s
cription list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Mich
a
el J Grub
e
r
Documentation/urls:
Remove spurious exa
m
ple mar
k
ers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Mic
h
a
e
l J Gruber
Documentation/gitdiffcore: Remove
m
isleading
d
a
te in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michae
l
J Gruber
Docume
n
t
a
t
ion/git-reflog:
Fix
f
o
rma
t
t
ing of co
m
mand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik Fay
e
-Lund
rev-lis
t
: fix --pre
t
ty=onel
i
ne wi
t
h empty message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-re
c
ursive:
add a l
a
bel for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
i
ede
r
ch
e
rry
-
pick, revert: add
a
label
f
or a
n
c
e
stor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
reve
r
t: c
l
arify
l
abel on conflic
t
hun
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onat
h
an Nie
d
er
comp
a
t: add
m
empcpy()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
checkou
t
-m --conflict=diff3: add
a
label for ance
s
tor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
merge_tree
s
(): add ancestor la
b
el parameter for di
f
f3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan
Nieder
me
r
ge_f
i
l
e
(): a
d
d co
m
ment explaining behav
i
or wrt conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
c
h
eckout --c
o
n
flict=diff3: add a label for a
n
cestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
athan Niede
r
ll_merge():
a
dd ancestor
l
abel parameter
f
or diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
merge-file --d
i
ff3:
a
d
d
a label for anc
e
sto
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
natha
n
Nied
e
r
x
d
l_me
r
ge():
m
ove fil
e
1 and
fi
l
e2 labels
to xmparam
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
x
dl
_
merge(): add optional a
n
c
e
stor lab
e
l
t
o dif
f
3-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
test
s
: doc
u
ment cherr
y
-pick behavior in f
a
ce of confli
c
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
tests: docum
e
nt
form
a
t of conflicts from checkou
t
-m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
.
mailmap: Entries for
Alex Ben
n
ée, De
s
kin Miller, Vitaly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
rever
t
: fix ti
n
y me
m
ory leak in cherry-pic
k
--ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o 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-20
Juni
o
C Hamano
Merge branch 'jk/maint-add-ignored-dir'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C Hama
n
o
Merge br
a
nch 'ml
/
color-gr
e
p'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C
H
am
a
no
Merge
branch 'jc/colo
r
-attrs'
commit
|
commitdiff
|
tree
2010-03-20
J
unio
C Hamano
M
e
r
g
e
b
ranch
'cc/reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Ham
a
no
Merge branch 'fl/askpass'
commit
|
commitdiff
|
tree
2010-03-20
J
unio
C Hamano
Merge
branch 'bg/apply-fix
-
blank
-
a
t
-eof'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C
Hamano
M
e
rge bra
n
c
h 'bw/
u
nion
-
merge-refactor'
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
mano
Merge
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Upd
a
te dra
f
t release
notes to 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Christian Couder
r
eba
s
e -i: use new
-
-ff cherry-p
i
ck
o
pt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
An
d
reas Gruenbac
h
er
fetch: Fix minor memory leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andre
a
s Gruenba
c
her
fetch: F
u
t
ure-
p
roof initializa
t
ion
o
f a refspec on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
An
d
r
e
as Gruenb
a
ch
e
r
fe
t
ch: Check for
a
"^{}" suffix w
i
t
h suffix
c
mp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ben
j
a
m
i
n C Mey
e
r
Fix a spelling mistake in a git-p4 c
o
nsole m
e
s
sage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brian Gernhardt
U
s
e test_expect_
s
ucc
e
s
s for
t
e
st setups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Be
n
Wal
t
o
n
Moderniz
e
g
it calling c
o
nv
e
ntions in hook
templ
a
tes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Be
n
Wa
l
ton
Ma
k
e templates ho
n
our SHELL_PATH and
P
ERL_PATH
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Imre Deak
d
a
e
mo
n
: parse_hos
t
_and_port SIGSEGV if
por
t
is
s
p
ecif
i
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jo
n
athan Nieder
Makefile: Fix occasional GIT-CFLAGS break
a
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
onathan Nieder
M
a
kefile: Fix
C
DPATH
problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
B
r
a
ndon C
a
s
ey
t/t5505
-
remote
.
sh: escape * to prevent i
n
terpre
t
a
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
B
r
andon Ca
s
ey
t5505: add m
i
s
s
ing &&
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brandon
Casey
t
5
505:
r
emo
v
e
unnecessary sub
s
hell invocations
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
B
r
andon Casey
notes
.
c: rem
o
ve inappr
o
priate c
a
ll to return
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
S
t
e
phen Boyd
p
u
l
l: rep
l
ace
u
nneces
s
ary sed inv
o
c
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Ham
a
no
M
e
r
g
e bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2010-03-17
Thomas Rast
Docum
e
ntation: r
e
ceive
.
denyCu
r
rent
B
r
a
nch
d
e
f
aults to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Ian Ward Comfort
ba
s
h
:
complete *_HEAD refs if pres
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio
C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-17
Ander
s
K
aseorg
e
veryday: f
s
c
k and gc are not everyday opera
t
ion
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Gustaf Hendeby
Improve error messages
from '
g
it
st
a
sh show'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
daemon
.
c: avoid accessing s
s
_family membe
r
of stru
c
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
t/t1
3
0
4: ma
k
e a sec
o
nd col
o
n
optio
n
al in the ma
s
k ACL
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Case
y
t/t1
3
04: set the ACL effectiv
e
rights ma
s
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
t/t1304: use
'test -r' to test readability rather tha
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
B
r
ando
n
Casey
t/t1
3
04: set the Defau
l
t
A
CL base entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
B
randon Casey
t/t1304: avoid -d option
t
o setfacl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-16
Junio C Hamano
r
e
fs:
r
ef e
n
try with NULL sha1
i
s can be
a
da
n
g
l
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
René
S
cha
r
fe
g
rep: enable thread
i
ng for con
t
ext line p
r
i
nting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Mich
a
el
J Grube
r
D
ocumentation/git-read-tree:
cla
r
ify 2-tree m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gruber
D
o
cumentation/git-read-tree
:
fix table layout
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Junio C
H
aman
o
Merge bra
n
ch 's
d
/
fo
r
mat-pat
c
h-to'
commit
|
commitdiff
|
tree
2010-03-15
J
u
n
io C Ha
m
ano
Merge br
a
nch
'
tc/http-cle
a
nup'
commit
|
commitdiff
|
tree
next