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
cmd_merge(): Parse options before checking MERGE_HEAD
2010-11-17
Johan Her
l
a
nd
cmd
_
me
r
ge(): Parse o
p
tions before che
c
k
ing MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Herland
P
r
ov
i
de 'git n
o
te
s
get-ref' to easily
r
e
tr
i
eve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herlan
d
git notes m
e
r
g
e:
Add testcases for merging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
Herland
git
notes
m
erge: Add another auto-reso
l
ving
strateg
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
git notes
mer
g
e: --commit should fail
i
f un
d
erly
i
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
an
d
g
i
t
no
t
e
s
merge: List confl
i
cting no
t
es in notes
m
e
rge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes me
r
ge: Manual c
o
nflict resolu
t
ion, part 2
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
la
n
d
g
i
t
n
otes merge: Manual conflict
resolution, part
1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
Documen
t
ati
o
n: Preliminary docs o
n
'
g
it n
o
tes
m
erge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
notes
m
erge: Add auto
m
atic
c
onflict
r
es
o
lvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
git
notes
merge: Ha
n
dle real, non-conflic
t
i
n
g n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
builtin/notes
.
c: Refactor c
r
eation of
notes
c
ommi
t
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an He
r
land
git notes merge: Initial implementation
h
andling tri
v
ial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
builtin/notes
.
c:
S
p
lit
n
otes ref DWIMme
r
y
i
n
to a sep
a
rate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
notes
.
c: Use tw
o
ne
w
lin
e
s (instead o
f
one)
when co
n
catenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
(trivial) t3303: Indent with ta
b
s
instead of spa
c
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
n
o
tes
.
h/
c
: Propaga
t
e
c
ombine_notes_fn
return
va
l
ue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n H
e
r
l
a
nd
notes
.
h/c: Allow
comb
i
ne_note
s
f
u
n
ctions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herl
a
nd
notes
.
c: Reorder f
u
nction
s
in preparat
i
on
f
or ne
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h
: M
a
ke default
_
notes
_
ref() available in notes AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han He
r
land
(trivi
a
l) notes
.
h: Minor documen
t
ation fixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
ote
s
.
c
:
Hexify SHA1 in d
i
e() message
f
rom init_no
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Her
l
and
revision:
T
u
r
n off
h
istory simp
l
ifi
c
ation in --
a
ncest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revi
s
ion: Fix typo
in --
a
ncestry-
p
ath erro
r
message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
Documentation/rev-lis
t
-options
.
txt: Ex
p
lain --ances
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
Documentation
/
rev-list
-
options
.
txt: Fix missing
l
ine
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Joha
n
Herland
d
i
ff
.
c: E
n
s
ure
"
i
n
d
ex $from
.
.
$
to"
line contain
s
unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herlan
d
builtin-n
o
tes: Minor (mostly
p
ars
e
_option
s
-rel
a
ted
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
H
erla
n
d
s
ubmodule summary: Don't ba
r
f when in
v
ok
e
d in an
em
p
t
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
buil
t
in-notes: Add "cop
y
"
subc
o
mmand
for cop
y
ing notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herla
n
d
builtin-note
s
:
Misc
.
refactoring o
f
ar
g
c
and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
builtin-no
t
es: A
d
d -
c
/-C
o
p
ti
o
ns
f
o
r
r
e
u
s
i
n
g notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-no
t
e
s
: Refacto
r
handling of
-
F option to al
l
ow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
b
uiltin-
n
otes: D
e
precate the -m/-
F
options
f
o
r
"git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
bui
l
tin-notes: Add "app
e
nd" subcomm
a
nd for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes: Add "
a
dd" subcommand
f
o
r adding n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herla
n
d
b
uiltin-notes: Add
-
-m
e
ssage/--
f
ile al
i
ases 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 listing no
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
D
o
cumentatio
n
:
G
eneralize git-notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
no
t
es: Add "pru
n
e" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
Notes API: prune_notes(): P
r
une notes that
b
elong
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
t3305: V
e
rify tha
t
removing notes trigger
s
automa
t
i
c
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
notes: Add "remove" subc
o
mmand for remov
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach
b
uiltin-notes to remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herlan
d
Tea
c
h
n
o
t
es code to
p
rop
e
rly preser
v
e
n
o
n-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Her
l
and
t3305: Ve
r
i
fy that
a
dding many
notes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
l
and
t33
0
1: Verify successful ann
o
t
a
t
ion of
n
on-
c
ommits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
Built
i
n
-
ify git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Refact
o
r notes concat
e
n
a
ti
o
n i
n
t
o
a flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API: Allow multiple
c
on
c
u
r
rent notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
Notes
A
P
I: write
_
n
otes_tree()
:
Store the note
s
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
N
otes API: for_each_note(): Traverse t
h
e
entire note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes API: g
e
t
_
note(): Retu
r
n the note a
n
notating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Note
s
API: remove_note(): Remove note
obj
e
cts from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API: a
d
d_note(): Add note
o
bje
c
ts
to the i
n
ternal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Notes API: init_not
e
s(): Initialize the note
s
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Add tests
f
or chec
k
ing correct handling of $GIT_NOTE
S
_RE
F
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herl
a
nd
N
o
tes API: ge
t
_commit_notes
(
) -> f
o
r
mat_note() + rem
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Minor
c
osmetic fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Joha
n
Herla
n
d
b
u
iltin
-
co
n
fig:
F
ix crash when using "-f
<
rel
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Ad
d
more testcases
to test
f
a
s
t-im
p
o
rt of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9
3
01
to t9
3
50,
t
o make room
for m
o
re fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herl
a
nd
fast-i
m
port
:
Pro
p
e
r
n
otes tree manipulatio
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
J
ohan Herl
a
nd
F
ix c
r
asher on enc
o
untering SHA1
-
li
k
e
non-note in no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Basic build i
n
fras
t
ructure for Py
t
hon sc
r
ipt
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add s
e
lftests ver
i
fy
i
ng
concatenation of multiple
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herlan
d
Refactor
not
e
s
code to
c
on
c
at
e
nat
e
multiple notes annota
t
i
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
d
d s
e
lftests
verifying tha
t
we can
p
arse no
t
es trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
a
nd
Teach th
e
n
o
t
e
s lookup code to parse no
t
es tre
e
s with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
Teach notes code
t
o
free its internal dat
a
struct
u
r
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Herland
Add
f
la
g
s
to get_commit_notes() to
con
t
rol the
for
m
at
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan
H
erland
t3302
-
n
otes
-
index-expensive
:
Speed
up crea
t
e_
r
epo
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n H
e
rland
fas
t
-import:
Add supp
o
rt for import
i
ng c
o
m
m
it n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
He
r
land
Teach "-m <msg>" and "-F <f
i
le>" to
"git notes edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
J
oh
a
n
Herl
a
nd
git c
l
o
n
e: Add --recursive
to a
u
tomatic
a
lly checkout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herl
a
nd
t7407:
Use 'rev-pa
r
s
e
--shor
t
' r
a
ther than bash's s
u
bstring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule status: Ad
d
-
-
recur
s
iv
e
t
o
recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan
Herland
g
it submodule
u
pdate: Introduce
--recursive to
u
pd
a
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
h
a
n Herland
git su
b
module
f
o
reach:
A
dd --r
e
cu
r
s
ive to recurse i
n
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan
Herland
git submodule forea
c
h: te
s
t
access to
subm
o
dule name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan Herl
a
nd
Add
s
elftest for 'git submodule
foreac
h
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan
H
erlan
d
gi
t
submodule: Cleanup
u
sag
e
string and add opt
i
on
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan Herla
n
d
git submodule foreach: Pr
o
vide access to
subm
o
du
l
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Joha
n
Herland
he
l
p
.
c
: give correct struc
t
ure's s
i
ze to
m
ems
e
t(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan Herland
quickfetch(): P
r
eve
n
t
overflow of the rev-list command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
o
han
H
er
l
a
n
d
git-submodule
:
add support for --merge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan
H
e
rland
Re
n
a
me s
u
bm
o
dule
.
<name>
.
reba
s
e to s
u
bm
o
dule
.
<name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Johan Herland
U
pdat
e
docs on
b
ehaviour of 'core
.
sharedR
e
posito
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Jo
h
an Herland
Move
c
hm
o
d
(foo, 0
4
44) into
move_temp_to_fi
l
e
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Jo
h
an
H
erland
Use str
c
hr
n
ul() instead of strchr() plu
s
manual workaround
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
J
ohan
Herland
Fix subm
o
dule sy
n
c
w
ith r
e
lative submod
u
le URLs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
for-each-ref: Fix --
f
o
r
mat=%(
s
ubject) for
l
og
m
e
ssage
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Johan
Herland
Fix AsciiDoc errors in merge
d
ocumentation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
Johan Herland
Br
i
ng
l
o
cal clone's origin URL in line
with that of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
J
o
han
H
erland
Teach "git diff -p" HT
M
L funcn
a
me pat
t
e
rns
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
J
o
han Herland
Tea
c
h
"
g
it
clo
n
e" to pack
r
e
fs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Jo
h
an Herland
Prepare t
e
stsu
i
t
e fo
r
a "gi
t
clone" that pa
c
k
s
refs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
Move pack_refs() an
d
f
r
ie
n
ds into libgit
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Her
l
and
Incorporate fetched packs in futur
e
object t
r
aversal
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan Herland
T
h
e
"curl"
e
x
ecutable is no
longe
r
require
d
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next