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 'maint'
2010-03-21
E
r
ik
Faye-Lund
cherr
y
: support
-
-abbrev option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
M
i
chael
J
G
r
u
b
e
r
Do
c
umentation/git-clone: Tr
a
n
sform des
c
ription list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Mic
h
ael J Gruber
Doc
u
mentat
i
on/u
r
ls: Remove spurious exa
m
ple mar
k
ers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Grub
e
r
D
oc
u
m
entatio
n
/gitdiffco
r
e
:
Re
m
ove misleading date in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
D
o
cumentation/
g
it-
r
eflog
:
Fix
f
ormatting
o
f command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik
Faye-
L
und
rev
-
l
i
s
t
: fix --
p
retty=oneline with
empty m
e
ssage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
han Nieder
merge-re
c
u
r
s
ive: add a lab
e
l
for an
c
estor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
cherry-pick, revert
:
a
dd a la
b
el for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
r
e
ve
r
t:
clarify labe
l
on conflict hunks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
compat: add mempcpy()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
c
h
ecko
u
t -m --conf
l
ict=diff3: add a l
a
b
e
l for an
c
estor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
m
erge_tr
e
e
s
(): ad
d
ancestor lab
e
l parameter for
d
iff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_file(): add com
m
e
nt
explaining behavior wrt c
o
nfli
c
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ch
e
ckout --
c
onflict=diff3: ad
d
a label for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
a
n
N
ieder
ll_
m
e
rge(): add a
n
cestor
label parameter
f
or diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
on
a
than
N
ie
d
er
merge
-
file --diff3: add
a
label fo
r
anc
e
stor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan
Nieder
xdl_merge
(
):
m
ov
e
file1 and f
i
le2 labels
to xmp
a
ram
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_merge(
)
: add optional
a
n
cestor lab
e
l to diff3-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an N
i
ed
e
r
tests:
do
c
u
m
ent
c
h
e
rry-pick b
e
ha
v
ior in face of conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
tests: docume
n
t
format o
f
conflict
s
from ch
e
c
k
out
-m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Mich
a
el J Gruber
.
mailmap: Entries f
o
r
A
l
ex Benn
é
e
,
Deskin Miller,
Vitaly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
ath
a
n
N
i
e
der
r
e
vert: f
i
x tiny memory l
e
a
k in cherry-pick --ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C
H
amano
Updat
e
d
r
aft
r
elease notes to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Hama
n
o
Merge bran
c
h
'
j
k/maint-add-ign
o
red-dir'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C Hamano
M
e
r
g
e bra
n
ch '
m
l
/color-grep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'j
c
/
col
o
r-attrs'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
no
Merge branch 'c
c
/reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C Haman
o
M
e
rge branc
h
'fl/askp
a
s
s
'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Hamano
Merge bra
n
ch 'bg
/
appl
y
-f
i
x-blank-at-eof'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'bw/
u
nion
-
m
erge-refactor'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Update draf
t
r
e
le
a
se notes to 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Christia
n
C
ouder
r
e
base -i: use
n
e
w --ff cherry
-
pick option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas
G
r
ue
n
bacher
fetch: Fix
m
inor
memory leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andre
a
s G
r
ue
n
b
acher
fetc
h
: Fu
t
u
r
e-pro
o
f
i
nitializat
i
on
of a re
f
s
pec
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gru
e
nbacher
fetch: Check for a
"
^{}"
s
uffix with suffixcmp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ben
j
a
m
in C
M
eyer
Fix a spelling mista
k
e in a git-p4 conso
l
e
me
s
s
a
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Br
i
an Ge
r
nha
r
dt
U
s
e test_expect
_
s
u
ccess for test
s
etu
p
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ben
Walto
n
Mod
e
r
n
ize git
c
a
llin
g
conventions in
hook
t
emplates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ben Walton
M
a
ke te
m
p
l
ates honour
S
HELL_PATH and PER
L
_
P
ATH
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Im
r
e D
e
ak
daemon: parse_host
_
a
n
d
_port SIGSEGV if
p
ort is specified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
o
n
a
tha
n
Nieder
M
akefile: Fix occ
a
sional G
I
T-CFLAGS breakage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jona
t
h
an Nie
d
er
Makefile: Fix
C
D
P
ATH problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brandon
Casey
t/t5505-remote
.
sh: esc
a
pe * to prevent interp
r
etation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Bra
n
do
n
Casey
t5505:
a
dd missing &&
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
B
r
ando
n
C
a
s
ey
t5505: remove unnecessary subshe
l
l inv
o
ca
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
B
randon Casey
notes
.
c: remove inappr
o
priate call to retu
r
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
S
t
e
phen B
o
yd
pul
l
: replace
unneces
s
ary sed i
n
vocati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
J
u
nio C
Ha
m
ano
M
e
rge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-03-17
Thomas Ras
t
Documentation: receive
.
d
enyCurr
e
ntBranch d
e
faults to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
I
an Ward
C
omfort
bash: comple
t
e
*_HEAD ref
s
if present
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Jun
i
o C Hamano
Merg
e
bra
n
ch
'
m
aint'
commit
|
commitdiff
|
tree
2010-03-17
Anders Kaseorg
everyday: fsck and gc are not e
v
e
ryday
o
perations
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Gu
s
taf He
n
deby
Improve
e
rror mess
a
ges from
'
g
it s
t
a
sh show'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
B
r
a
nd
o
n Casey
daemon
.
c: avoid accessing ss_family member of struct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Case
y
t/t1304: m
a
ke
a
s
e
cond colon op
t
i
o
n
al in the
m
ask ACL
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
t
/
t1
3
04: set t
h
e
A
C
L
ef
f
ective rights mask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
B
randon
Casey
t/t1304
:
use 'test -r' to
test readabilit
y
ra
t
h
er than
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brand
o
n Casey
t/t1304:
s
et the Default
A
CL
b
a
se ent
r
i
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Case
y
t/t1304: avo
i
d
-d option to setf
a
cl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-16
Junio
C Hamano
refs:
ref en
t
ry wit
h
NULL sha1 is can be a
dangli
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
René
S
charfe
g
re
p
: enabl
e
threadi
n
g for con
t
ext lin
e
printing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gruber
D
o
cument
a
tion/git-re
a
d
-tree: cl
a
rify
2-
t
ree merg
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Michae
l
J Grub
e
r
D
o
cumentation/git-re
a
d
-tree: fix
t
able layout
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Junio
C
Hamano
Merge branch 'sd/format-patch-to'
commit
|
commitdiff
|
tree
2010-03-15
Juni
o
C Hamano
Merg
e
branch 'tc/http-cleanup'
commit
|
commitdiff
|
tree
2010-03-15
J
u
nio C Ha
m
ano
Merge branch 'tc/transp
o
rt-ve
r
bo
s
ity'
commit
|
commitdiff
|
tree
2010-03-15
J
u
nio C H
a
man
o
M
e
r
g
e branch 'ld/push-porcela
i
n'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge branch 'jh/no
t
e
s'
commit
|
commitdiff
|
tree
2010-03-15
Dave Ol
s
ze
w
s
ki
rebase
-
-interac
t
ive
:
don'
t
req
u
ire what's rebased to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Jari Aalto
git
-
sen
d
-em
a
il
.
perl - try to give r
e
al name
of the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Jar
i
Aa
l
to
git-
s
en
d
-email
.
perl: add
o
ption --s
m
tp-debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
J
ari
A
a
l
to
git-send-email
.
perl: i
m
prove error mess
a
ge in
send_me
s
sage(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Ha
m
ano
tests for "git ad
d
ignored-dir/file" without -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Jeff
King
dir: fix
C
OLLECT_IG
N
ORED on ex
c
luded
pref
i
x
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
J
u
n
i
o C Ham
a
no
t
0050
:
mark no
n
-working test
a
s such
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Jens Lehmann
git status: ignoring untrac
k
ed
f
iles must app
l
y
t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Ham
a
n
o
Merge br
a
nch
'mai
n
t'
commit
|
commitdiff
|
tree
2010-03-14
D
a
ve Olszewski
don't use d
e
fault
revisi
o
n if a rev was
s
p
ecified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
René Scharfe
f
o
r
_each_r
e
cent_reflog_ent(): use st
r
buf, fix o
f
f
s
e
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Jun
i
o C Hamano
t/Makef
i
l
e: remove test artifacts u
p
o
n
"mak
e
clean"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
René Scharfe
blame: fix in
d
e
n
t
of line numbers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Junio
C
Hamano
Merge g
i
t:/
/
g
it
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2010-03-13
Jens Lehmann
git status: Fix
false p
o
sitiv
e
"ne
w
comm
i
ts" output
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
J
ens Lehmann
Refactor dirty
s
u
bmodule de
t
ec
t
ion in diff-lib
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Jun
i
o C H
a
ma
n
o
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-03-13
Stephe
n
Boyd
notes: rework subcommands and parse opt
i
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
gi
t
-notes(1): add a sect
i
on about t
h
e me
a
ni
n
g of hi
s
tory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
notes: track
whether notes_tre
e
s
were
c
han
g
e
d at
a
ll
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thomas
R
ast
notes: add shorthand --ref to override
G
IT_NOTES_REF
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Th
o
mas Rast
co
m
mit --amend: copy not
e
s to the
n
e
w
co
m
m
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
rebase: support
automatic n
o
tes copying
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
T
homas Rast
notes: implement he
l
pers neede
d
for note copying dur
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Tho
m
as Rast
notes: implement '
g
it
notes copy -
-
s
tdin'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Tho
m
as R
a
st
rebase -i: invoke pos
t
-rewrite hoo
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thoma
s
Rast
r
ebase: invoke post-rewrite
hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thomas
R
ast
co
m
mit --
a
m
end: invoke post-rewrite
ho
o
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Th
o
mas Rast
Documentati
o
n: document post-rewri
t
e h
o
ok
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Ra
s
t
Suppo
r
t showing notes from
more than one
n
o
t
e
s tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Tho
m
as Rast
test-lib: unset GIT_
N
OTES_REF
to s
t
op it from influencing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next