repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: Preliminary docs on 'git notes merge'
2010-11-17
Johan H
e
rland
Documentation: Preliminary docs on 'git not
e
s m
e
rge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git note
s
merge
:
A
d
d auto
m
atic confl
i
c
t
res
o
lvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git n
o
tes
me
r
ge: Handle real,
n
on-
c
onflicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erl
a
nd
builtin/n
o
tes
.
c
: Refactor creation of notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git no
t
es merge: Initial i
m
pleme
n
tat
i
on
handli
n
g
t
r
i
v
ial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n H
e
rla
n
d
bu
i
l
t
in/note
s
.
c
: Split notes
ref DWIMmery into a separ
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
notes
.
c: Use two
newline
s
(instead of one) when concatenati
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
an
d
(trivia
l
) t3303:
I
nde
n
t w
i
t
h tabs
inst
e
a
d
of
s
pa
c
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
notes
.
h/c: Propaga
t
e comb
i
ne_not
e
s
_
fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rl
a
n
d
no
t
es
.
h/c: Allow combine_notes functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
c
: Reorde
r
functions in preparation for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
note
s
.
h:
Ma
k
e
defau
l
t_notes_
r
ef(
)
available in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
er
l
and
(triv
i
a
l
) notes
.
h: Minor do
c
u
m
entation fixes to
copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
notes
.
c: Hexi
f
y
SHA1 in die() message from in
i
t_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
revision:
Turn off hist
o
ry simplification in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
revi
s
ion: Fix
ty
p
o in --ancestry-path error m
e
s
s
ag
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herlan
d
D
ocumentation/rev-list-options
.
txt: Explain --anc
e
stry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herla
n
d
D
o
cumentation/re
v
-li
s
t-options
.
tx
t
:
F
ix mis
s
ing l
i
ne
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herl
a
nd
diff
.
c
:
Ens
u
re "index $from
.
.
$to
"
line contains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herla
n
d
bu
i
ltin-notes: Minor (mo
s
tly par
s
e_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan He
r
land
submodule summary: Don't barf when invoked
i
n an
empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-no
t
es: Add "c
o
py" subcomman
d
for copyi
n
g
no
t
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-notes: Misc
.
refactori
n
g o
f
argc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-not
e
s
: Add -c/-C options for reusing
n
o
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Refactor handling
of -F o
p
t
i
on to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
H
e
rland
builtin-no
t
es: Depr
e
cate
t
he -m/-F o
p
tions for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herlan
d
builtin-notes: Add "ap
p
end" subcom
m
and for a
p
pending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes: Add "add" subcommand for adding no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-n
o
t
e
s: Add --
m
essag
e
/--fil
e
ali
a
s
e
s
for
-m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
tes:
Add
"
list"
su
b
command for
l
isting no
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
l
and
D
ocumen
t
ation
:
G
e
neralize git-
n
otes docs to
'object
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes:
A
dd "prune" subco
m
mand for remov
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Not
e
s
A
P
I: prune_note
s
():
Prune notes t
h
at belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
t3305: Veri
f
y th
a
t
r
emoving notes
triggers automati
c
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-no
t
es:
A
dd "
r
emove" s
u
bcommand for re
m
o
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
T
each
builtin-note
s
t
o remove
e
mpty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Te
a
ch
not
e
s code to
p
rope
r
l
y
p
reserv
e
non-notes
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
and
t3305:
Verify t
h
at
adding many notes
w
i
th git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
t3301: Verif
y
successf
u
l annotat
i
on o
f
non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
B
uiltin-if
y
git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
e
r
land
Refact
o
r notes concatenation into a flexible inter
f
ace
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API: All
o
w
m
u
ltip
l
e con
c
ur
r
e
n
t
n
o
tes
t
rees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API:
w
rite_notes_tree(): S
t
ore the n
o
tes tre
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API:
for
_
each_note(
)
: T
r
a
v
erse the entire
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes API: get_n
o
t
e
():
R
e
tu
r
n the
n
ote annotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erla
n
d
Notes
A
P
I
: remove_note(): Remove note objects
from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herlan
d
Notes AP
I
: add_n
o
te(
)
: Add n
o
te ob
j
e
cts to th
e
int
e
r
n
al
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
Notes API: ini
t
_
n
o
tes():
I
nitialize the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
nd
Ad
d
tests for checking correct handling
o
f $G
I
T_NOTE
S
_RE
F
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
N
otes API:
ge
t
_comm
i
t
_notes(
)
-> forma
t
_note() + r
e
move
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rl
a
n
d
Minor cosmetic fix
e
s
to
notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
o
han
Herland
builtin-config: Fix crash when
u
sing "-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add more
t
estcase
s
to test
f
ast-import
o
f
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9301 to t9350, to make
r
oom f
o
r
more
f
ast-i
m
port
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
Herland
fast-impor
t
:
P
roper not
e
s tr
e
e
m
ani
p
u
l
ation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
J
o
h
a
n Herla
n
d
Fix crasher on encounterin
g
S
H
A1-like non-not
e
in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Her
l
and
Basic b
u
ild infrastructure for Pyt
h
on scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
e
rland
A
dd selftests ve
r
ifying concatenation
o
f multiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
a
nd
Refac
t
or n
o
tes co
d
e
t
o concatenate multiple not
e
s an
n
otating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
He
r
land
A
dd
s
elftes
t
s verifying that we can parse
n
ote
s
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Herl
a
nd
Teach the notes look
u
p
code
t
o parse notes trees wi
t
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach notes code to fr
e
e its int
e
r
n
al
d
ata
s
tructures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan
Herland
Ad
d
flags to get_commit_n
o
t
e
s()
t
o cont
r
ol t
h
e
f
or
m
a
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
t3302-notes-index-ex
p
ensi
v
e: Speed
up cr
e
ate_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
fast-import: Ad
d
suppo
r
t
for importi
n
g commi
t
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an
H
e
rlan
d
Teach "-m <msg
>
" and "-F <file>"
t
o "git
n
otes edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Joha
n
H
erland
git clone:
A
d
d --recursive to aut
o
matically
c
he
c
ko
u
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Joha
n
Herland
t7
4
0
7
: Use 'rev-parse --
s
hort'
rather
than
b
ash's substring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an Herland
g
i
t
s
ubmodule status: Add --recursiv
e
t
o
recurse
i
nto
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan
H
erland
g
i
t submo
d
ule up
d
ate: Int
r
odu
c
e
-
-
recursive to update
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an Her
l
and
git
s
u
b
module fore
a
ch: Add
-
-recursive
to
r
ecurse int
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
g
i
t
submodule fo
r
e
a
c
h
:
test access to subm
o
dul
e
n
a
m
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joh
a
n Herland
Add s
e
lftest for
'
git submo
d
ul
e
f
oreach'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git s
u
b
mod
u
le: C
l
e
anup usage s
t
ring
a
n
d add option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
J
ohan
H
e
rland
git submo
d
ul
e
fore
a
ch: Pr
o
vide
access
t
o
s
ubmo
d
ule
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
J
ohan Herl
a
nd
help
.
c: give correct
s
truc
t
ure's siz
e
to memset()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan
H
erland
qui
c
kfetch(): Prevent overflow o
f
the rev-list com
m
and
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
oh
a
n Herland
git-submod
u
le: ad
d
support for
-
-mer
g
e
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan H
e
rland
Rename s
u
b
module
.
<name>
.
reb
a
se t
o
submod
u
l
e
.
<name
>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Joh
a
n Herl
a
nd
U
p
d
a
te doc
s
on behaviour of
'c
o
re
.
s
haredRepository
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Joh
a
n
H
e
r
land
Move chmod(f
o
o, 04
4
4
)
into move_temp_to_fi
l
e()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Joha
n
He
r
land
U
s
e s
t
r
chrnu
l
() instead of s
t
rc
h
r() plus
m
anual work
a
round
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
J
o
h
an Herland
Fix
s
u
bmodul
e
syn
c
with relativ
e
submodule URLs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
f
or-ea
c
h-ref:
Fix --format=%(
s
ubject)
f
or log
m
ess
a
g
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Jo
h
a
n
H
er
l
and
Fix
A
s
c
iiDoc errors
in mer
g
e documentation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
Johan He
r
la
n
d
Bring local clone's
o
rigin URL in line wi
t
h t
h
at
of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herland
T
e
ach "git diff -p" HTML funcn
a
me
p
atte
r
ns
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herlan
d
Teac
h
"git clone" to
pa
c
k
r
efs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herlan
d
P
r
epare testsui
t
e for a "git clone" that pack
s
refs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
Move
pa
c
k_refs
(
) and frien
d
s
into libgit
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
J
o
han H
e
rland
Incorp
o
rat
e
fetch
e
d packs in fu
t
ure
obj
e
ct
t
rav
e
rsal
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan Herland
The
"
c
url
"
e
x
ecutable is no
l
onger r
e
quired
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan Herland
Consistency: Use "li
b
curl" instead of
"
cU
R
L
l
ibrary
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan
Her
l
and
c
pio is
no lo
n
ger used by gi
t
-
c
lone
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
J
o
h
a
n Herlan
d
A
dd test
f
or
clonin
g
wi
t
h "--referenc
e
" re
p
o being
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
Johan Herlan
d
Add a test fo
r
a
n
o
t
her
comb
i
nat
i
o
n of --re
f
eren
c
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-27
J
o
ha
n
Herland
Fix 'git cvsexp
o
rtcommit -w $cvsdir
.
.
.
' whe
n
used
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-27
J
ohan Herland
Add
testcas
e
for '
g
it cvsexport
c
ommit -w $cvsdir
.
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-13
Johan Herl
a
nd
Fix 'git
cvsexp
o
rtcommit -w
$
c
v
sdir
.
.
.
' whe
n
u
s
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-13
Joh
a
n Herland
Ad
d
testcase for
'
git cv
s
expo
r
tcommit -w $cvsdir
.
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next