repo.or.cz
/
tgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 1.7.1-rc1
2010-03-25
Stephen Boyd
f
m
t
-
merg
e
-msg: hide s
u
mmary option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Stephen Boyd
f
m
t-merge-msg: remove c
u
stom stri
n
g_list i
m
ple
m
e
n
tatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
S
t
e
p
hen Boyd
string-list
:
a
d
d
unsorte
d
_s
t
ring_lis
t
_lookup()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Stephen Bo
y
d
fmt-merge
-
ms
g
: use
p
r
ett
y
.
c r
o
uti
n
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
St
e
p
h
en Bo
y
d
t62
0
0: test f
m
t-merg
e
-msg more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Stephen Bo
y
d
t6200:
m
o
d
e
r
n
ize with test_ti
c
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Stephen Boyd
f
mt-m
e
r
g
e-msg
:
be quiet
i
f
n
o
thi
n
g
to merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Junio C Hamano
diff -
-
che
c
k
:
honor conf
l
ict-
m
arker-
s
ize attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge bran
c
h 'jh/m
a
i
nt-submodu
l
e
-
status-in-void'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ha
m
ano
Me
r
ge branch 'tr/notes-display'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge
b
r
an
c
h
'
jl/subm
o
d
ule-diff
-
dirtiness'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
M
e
rge branch 'pb/
l
og-
f
irst
-
parent-
p
-m'
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io C Hamano
M
e
rge bran
c
h
'jc/m
a
int
-
ref
s
-dangling'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
H
a
mano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
Hamano
Merge
b
ranch 'jc/
c
olor
-
att
r
s' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-24
Junio C
H
aman
o
Me
r
ge
b
ran
c
h
'
j
k/maint
-
a
d
d-ignored-dir'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2010-03-24
J
uni
o
C Haman
o
Merge branch 'bg/apply-fix-blank-at-eof' into main
t
commit
|
commitdiff
|
tree
2010-03-24
Ma
r
c Branchaud
Teach rebase
t
he --no-ff o
p
tion
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Shawn O
.
Pearce
http-backend: Don't i
n
finite loop 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
.
Tyler
B
al
l
ance
Co
r
rec
t
references t
o
/usr/b
i
n
/
p
ython which
does no
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Mark
u
s Heid
e
lbe
r
g
Documenta
t
ion: explain the mean
i
ng of "-g"
i
n
git-d
e
s
cri
b
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
M
ichael J Gruber
rev-l
i
st:
u
se default abbrev l
e
n
gth when ab
b
r
ev-commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Ramkumar
R
amachandra
imap-send: R
e
m
ov
e
l
i
mitation on me
s
sage body
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
J
u
nio C Haman
o
Sync
w
ith Git 1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
J
unio C
H
amano
Gi
t
1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hama
n
o
M
e
r
g
e
b
r
a
n
ch
'maint-1
.
6
.
6'
i
nto main
t
commit
|
commitdiff
|
tree
2010-03-21
M
i
c
hael J Gr
u
ber
.
mailmap:
Map the the firs
t
submi
s
sions of
M
J
G by
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
E
rik Faye-Lund
ls:
remov
e
red
u
nd
a
nt logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-Lund
cherry
:
su
p
p
o
r
t --
a
bbrev opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
D
o
cumentation/git-c
l
one: Transform descripti
o
n
list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
D
ocum
e
ntati
o
n/urls:
Remov
e
spurious example markers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Documentation/gitdif
f
c
o
re: Remove mislead
i
n
g
date in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Mi
c
hael J
Gr
u
ber
Doc
u
ment
a
tion
/
git-reflog: F
i
x
f
o
rmattin
g
of command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik
Faye-Lund
rev-l
i
st: f
i
x --prett
y
=o
n
eli
n
e w
i
th empty message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
merg
e
-
recursive: add a l
a
bel
for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
cherry-pick, reve
r
t: add a
label fo
r
ancesto
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
revert:
clar
i
fy label on conflict hunks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
tha
n
Nieder
compat: add mempc
p
y
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
a
than Nieder
ch
e
ck
o
ut -m --conflict=diff3
:
add a la
b
el for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
merge_tr
e
es():
a
dd ancestor label pa
r
ame
t
er
for dif
f
3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
merge_file(): add comment explaining behavio
r
wrt
conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
checkout
-
-confl
i
ct=diff
3
: add a l
a
bel
f
or ance
s
tor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
ll_merg
e
(
)
: a
d
d
ancestor label p
a
rameter for diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
me
r
ge-file
--d
i
ff3:
a
dd a
label for
a
nce
s
tor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_merge():
m
ove file
1
a
n
d file2 labels to xmparam
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
xdl_
m
erge(): add optional
ancesto
r
label to diff3-s
t
yle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
atha
n
Niede
r
t
e
s
ts: document che
r
ry-pick behavior i
n
face of
c
on
f
lic
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
t
ests: document format of conflict
s
fro
m
c
h
eckout -m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael
J
Gruber
.
mai
l
m
ap: Entries for Alex Bennée,
D
e
s
kin Miller, V
i
taly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
han Nie
d
er
revert:
fix tiny m
e
mory leak i
n
cherry-pick --ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio C H
a
m
a
n
o
Updat
e
draf
t
release notes to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge bra
n
ch 'jk/main
t
-a
d
d-ignore
d
-
d
ir'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge bra
n
ch 'ml/col
o
r-
g
rep'
commit
|
commitdiff
|
tree
2010-03-20
J
u
ni
o
C Haman
o
M
erge bran
c
h 'jc/color-attr
s
'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io
C Hamano
Merge branch
'cc/re
s
et-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge
branch 'fl/askpass'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
no
Merg
e
b
ranch 'bg/apply-fix-blank-at-e
o
f'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branc
h
'bw/
u
nion-m
e
rge-re
f
actor'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2010-03-20
J
un
i
o
C
Hamano
Up
d
a
t
e draft release notes to 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Christian Couder
rebase -i:
us
e
new --ff cherry-p
i
c
k
op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andrea
s
G
ruenbac
h
e
r
fetch
:
Fix minor
memory leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Grue
n
bacher
fetch: F
u
ture-proof initializa
t
ion of a refspec
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gru
e
nb
a
cher
f
etch: Check f
o
r a "^{}"
suffi
x
w
i
th
s
uf
f
ixcmp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
B
enjamin C Meyer
Fix a spelling mistake i
n
a git-p4 cons
o
le message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Bria
n
Gernhardt
Use test_expect
_
success
f
or test s
e
tups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ben Walton
Mod
e
rnize
g
it calling
conventi
o
ns in
hook templat
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ben Wal
t
on
Make tem
p
l
at
e
s ho
n
our SHELL
_
PATH a
n
d PERL_PATH
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
I
mre Deak
dae
m
on:
pa
r
se
_
host_
a
n
d
_port SIGSEGV
if port is spe
c
if
i
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
Makefile
:
Fix occasional GIT-C
F
L
AG
S
breakage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
o
nathan Ni
e
der
Makefile: Fix CDPATH
p
r
oblem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brandon Cas
e
y
t/t5
5
0
5-remote
.
sh: escape * to p
r
ev
e
n
t
int
e
rpretation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brandon
C
asey
t5505:
a
dd missing &&
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Bran
d
o
n Casey
t5505: remove unnecessa
r
y
subshe
l
l invoc
a
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brandon Casey
n
o
t
e
s
.
c: remove
i
napp
r
o
priate
call to ret
u
rn
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
S
t
e
p
h
e
n
Boyd
pu
l
l: rep
l
ace
u
n
necessary sed
invocation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Juni
o
C Hamano
Mer
g
e br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2010-03-17
Thomas Rast
Document
a
tion:
r
eceive
.
denyCurrentBranch defau
l
ts to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Ian
W
ard Comfort
bash: co
m
plete *_HEAD refs if pr
e
sen
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Hama
n
o
Merg
e
bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2010-03-17
Anders Kaseorg
eve
r
yday: fsck and gc
a
re not everyday operatio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Gu
s
taf Hende
b
y
Improve e
r
ror messages from 'git stash show'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
dae
m
on
.
c:
a
void
a
cc
e
ssing ss
_
family member of struct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
t
/
t
130
4
: make a
second colon o
p
ti
o
nal in the ma
s
k
A
CL
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Br
a
ndon Cas
e
y
t/t1
3
04
:
set the ACL
effective rights
m
ask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
t/
t
1304: use 'test -r' to te
s
t readability rather th
a
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon
C
asey
t/t
1
3
0
4: s
e
t the Def
a
u
l
t ACL base e
n
tri
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
t/t1304:
avoi
d
-d opt
i
on t
o
setfacl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-16
Junio C
Hamano
re
f
s: ref e
n
try
with NULL sha1 is can be a dan
g
ling
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
René Schar
f
e
g
rep: enable threading for co
n
text
line printing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Mich
a
el J Gruber
Documentation/git-r
e
a
d
-
tree: clarify 2-
t
r
e
e merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
M
i
chael
J
Gruber
Docu
m
entation/git-read-tree
:
fix table layout
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
J
u
n
io
C Ha
m
ano
Mer
g
e
branch 'sd/fo
r
ma
t
-pat
c
h
-
to'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
M
e
rge
b
ranch 'tc/h
t
t
p
-cleanup'
commit
|
commitdiff
|
tree
2010-03-15
Jun
i
o C
H
a
mano
Me
r
ge branch
'
tc/tra
n
sport-ve
r
bosity'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge
b
ranch 'ld/
p
ush-porcel
a
in'
commit
|
commitdiff
|
tree
2010-03-15
Ju
n
io
C
H
amano
M
e
rge bran
c
h 'j
h
/
no
t
es
'
commit
|
commitdiff
|
tree
2010-03-15
Da
v
e O
l
szewski
rebas
e
--i
n
teractive:
don't requi
r
e what's
re
b
ased
t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
J
ari Aalto
git-se
n
d-email
.
p
e
rl - try to give real name of
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Jari Aa
l
to
g
it-send
-
ema
i
l
.
p
e
rl: add option --sm
t
p-debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next