repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Provide 'git merge --abort' as a synonym to 'git reset --merge'
2010-11-17
Joha
n
Herl
a
nd
Provide
'git merge --abort' as a
s
ynonym to 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
cmd_merge(
)
:
Pars
e
op
t
ions
b
e
fore
checking MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
He
r
land
P
r
ovid
e
'git notes get
-
ref'
t
o e
a
sily ret
r
ieve curren
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git notes merg
e
: A
d
d testcases fo
r
mer
g
ing
notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
erg
e
: Add another
a
u
to-resolving st
r
ate
g
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes merge: --co
m
mit shou
l
d
f
a
i
l if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merge: L
i
s
t
conflicting
not
e
s in notes me
r
ge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rlan
d
gi
t
notes me
r
ge: Manual co
n
flict
r
esol
u
t
i
o
n, p
a
rt 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erland
g
i
t notes
m
e
rge: Manual conflict reso
l
u
tion, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erl
a
nd
Do
c
u
m
entation:
Preliminary doc
s
on
'
g
i
t n
o
tes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
Her
l
and
git notes merge: Add autom
a
tic conflict resol
v
ers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git notes merge:
H
andle real,
n
o
n-confl
i
ct
i
ng note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
b
u
iltin/notes
.
c: Refactor creation
o
f n
o
tes com
m
i
t
s
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
He
r
land
git n
o
tes
m
erge: Init
i
al implem
e
ntation handlin
g
triv
i
al
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
builtin/notes
.
c: Split notes ref DWI
M
m
ery into a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c
:
Use tw
o
newl
i
ne
s
(
i
nstead of one) when concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(
tr
i
vial) t3303: Indent with
tabs instead
o
f
sp
a
ce
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
note
s
.
h/c: Propaga
t
e combine_note
s
_fn re
t
urn value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
notes
.
h
/c: Allow
c
ombine_notes functions to r
e
m
o
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Reorder fun
c
tions in preparation for ne
x
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
not
e
s
.
h
:
Make defa
u
lt_
n
otes_ref
(
) availab
l
e in notes
A
PI
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
(trivial) notes
.
h: Mi
n
or
d
ocu
m
entation fixes
t
o copy
_
note
s
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
c: Hexif
y
SH
A
1 in die() me
s
sage from init_notes
(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
rev
i
sion:
T
urn off hi
s
tory simplification in
-
-an
c
estry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
r
e
v
i
sion: Fix
t
ypo in --ances
t
r
y-path er
r
or
messag
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
Doc
u
mentation/rev-
l
ist-op
t
i
o
ns
.
txt: Explain -
-
a
n
cestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
Document
a
ti
o
n/rev-list-options
.
t
x
t: Fix mis
s
ing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herla
n
d
diff
.
c
:
En
s
u
re
"
i
ndex $fr
o
m
.
.
$t
o
" line
c
ontains un
a
mbiguou
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Joh
a
n Herland
b
u
ilti
n
-
notes: Minor (
m
ostly parse_opt
i
ons-re
l
ated
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
subm
o
dule summary: Don't barf when invoked i
n
an
e
mpty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
builtin-
n
o
tes: Add "copy" subcommand for copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
buil
t
in-
n
o
tes: Misc
.
r
efactoring o
f
argc and
e
xit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes:
Add -c/-C options for reus
i
ng notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
buil
t
in-notes: Refacto
r
handling of -F option
t
o
allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
bu
i
ltin-notes: D
e
pre
c
ate the -m
/
-F
options
for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
a
n
d
bui
l
t
in-notes: Ad
d
"
a
ppend" subcommand for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
builtin-notes: Add "add"
subcommand for adding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
bu
i
ltin-notes:
Add --
m
essage/--file aliases for
-
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
builtin-
n
o
t
es
:
Add "li
s
t" subcomm
a
nd f
o
r li
s
t
ing
note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
land
Documen
t
ation: Gener
a
lize git-notes docs to
'ob
j
ects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
b
u
ilt
i
n-no
t
es:
A
dd
"prune"
s
ubco
m
m
a
n
d for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
Notes A
P
I: prune
_
notes(): Prune no
t
es that
b
el
o
ng to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
t3305: Verify that rem
o
v
i
ng no
t
es
triggers
aut
o
matic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
note
s
: Add "remo
v
e"
subcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Teach bui
l
tin-notes to remove empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Te
a
c
h notes code to prope
r
ly prese
r
ve non-note
s
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3305: V
e
rify that add
i
n
g ma
n
y
n
ote
s
with g
i
t-
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
n
d
t
3301
:
V
erify successf
u
l annotation of non-comm
i
ts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
B
u
iltin-ify
git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Refactor
n
otes concat
e
nat
i
on into a
f
le
x
i
b
l
e interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
Notes
A
P
I: Allow multipl
e
concurrent notes trees
w
ith
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API: w
r
ite_note
s
_t
r
ee(): Sto
r
e the
notes t
r
ee
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Notes API: fo
r
_
eac
h
_note(): Traverse the entire n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
Notes API: g
e
t_note(): Return th
e
note
a
nnotating th
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API:
r
e
m
ove_
n
ote(): Remo
v
e note objects
fro
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
P
I:
a
d
d
_note(): Add
n
ote objec
t
s
t
o the i
n
ternal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
No
t
es API: init_notes(): Ini
t
ia
l
ize the notes
t
r
e
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Add test
s
for c
h
ecking
c
orr
e
ct ha
n
dl
i
ng of $GIT_
N
OTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes A
P
I
:
get_co
m
m
i
t
_
note
s
() -> fo
r
ma
t
_note(
)
+ re
m
ove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Minor
c
osmetic fi
x
es to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan H
e
r
land
builtin-con
f
ig: Fix
cr
a
sh when
using "-f <re
l
ative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add
m
o
re
t
estcases to test
fa
s
t-import
o
f
n
ot
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rena
m
e
t9301
t
o
t9350, to make room for mo
r
e fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
f
ast-
i
mpor
t
:
P
roper notes tree manipulat
i
on
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Jo
h
an Herland
Fix crasher on enco
u
n
tering SHA1-like
n
o
n-note in notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herlan
d
B
a
s
ic
build inf
r
astructu
r
e f
o
r
P
ython scrip
t
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
ha
n
Her
l
and
Add selftests verifying
conc
a
tenation of multiple notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Her
l
an
d
Refacto
r
notes code
t
o concatenate multi
p
le notes an
n
otati
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add selftest
s
verifying tha
t
we can parse no
t
e
s t
r
ees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Tea
c
h
the notes look
u
p code to pa
r
se notes
t
rees
with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herland
Teac
h
notes code to free its interna
l
data structures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
Add flags to get_commi
t
_notes() to control
t
he for
m
at
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herl
a
nd
t3302-notes-index-expensive:
S
p
e
ed up
create_repo
(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
fast
-
import:
A
d
d sup
p
ort for importi
n
g commit notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
T
e
a
ch "-m <msg>" and "-F <file>" to "git notes e
d
i
t
"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan
Herland
git
c
lone: Add --recursive
to automatica
l
ly ch
e
ckou
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan
Herland
t7407:
U
se 'rev-parse --
s
hort' rather than bash's subst
r
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan Herland
g
i
t
submodule status: Add --rec
u
rsive to recurse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git s
u
b
modu
l
e u
p
date: Introduce
-
-recursi
v
e
to
update
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han Herland
git subm
o
d
u
le forea
c
h: Add --recu
r
sive to r
e
cur
s
e into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
r
l
a
n
d
git submo
d
ul
e
f
ore
a
ch: test
a
cces
s
to submodule name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
Ad
d
selftest
f
or 'git submodule fore
a
ch
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan
H
e
r
la
n
d
git s
u
bmodule:
Clean
u
p
us
a
ge string and
add
option
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
Johan
H
erland
git
s
ubmodule foreach:
Provide
a
cce
s
s to sub
m
odule
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
Johan H
e
rl
a
nd
h
e
lp
.
c: g
i
ve correct
s
tructure's size to memset()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
J
o
han Herland
q
uickfetch(
)
:
P
revent overf
l
ow of
t
h
e rev-list command
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herl
a
nd
git-submodule: add
s
u
p
port f
o
r
-
-mer
g
e
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
J
o
han Herland
R
ename submo
d
u
le
.
<name>
.
rebase
to submodule
.
<n
a
me>
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-04-18
Joh
a
n He
r
land
U
p
d
ate
d
o
cs on behaviour of 'cor
e
.
sharedRepository
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herla
n
d
Mo
v
e chmod(foo, 0
4
44) into move_te
m
p_to_fil
e
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-29
J
o
han
Herl
a
nd
U
s
e strchrnul() instead
o
f
s
t
r
chr
(
) plus
m
anual workar
o
und
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
Fix submodule
s
y
n
c
wi
t
h relativ
e
su
b
module URLs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Jo
h
a
n He
r
land
for
-
e
ach-ref: Fix --format=%(su
b
je
c
t) for l
o
g messag
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-04
J
ohan Her
l
and
Fix AsciiDo
c
errors i
n
mer
g
e documentation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-02
Jo
h
an Herland
Bring local c
l
o
n
e's or
i
gin U
R
L
i
n line wi
t
h
t
h
a
t
of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-08-21
Johan
He
r
land
Tea
c
h "git
d
iff -p"
H
TML
f
uncname p
a
tterns
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herla
n
d
Teach "gi
t
clo
n
e
" to
pack re
f
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herl
a
nd
Prepare tes
t
suite for a
"git
c
l
one" tha
t
packs refs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
J
o
han Herl
a
nd
Move pack_re
f
s
() and fri
e
nds into libgit
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
I
ncorporate fetched
p
acks i
n
futu
r
e obje
c
t
t
rave
r
s
a
l
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next