repo.or.cz
/
git
/
mingw.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
J
ohan Herland
c
md_merge
(
): Parse o
p
t
ions before che
c
king MERGE
_
HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
P
rovide 'gi
t
notes get-ref'
t
o easily re
t
rie
v
e curre
n
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
g
it
notes
m
er
g
e: Add testcases
f
o
r merging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
erge: Add anoth
e
r auto-resol
v
ing str
a
tegy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
e
r
l
and
git notes me
r
g
e: --c
o
mmit should fa
i
l if und
e
rlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
g
i
t
notes merge: List conflictin
g
notes
i
n no
t
es merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git
n
otes
merge: Manual conf
l
ict re
s
olution
,
pa
r
t 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Her
l
and
g
it notes merg
e
:
Manual conflict re
s
olution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herl
a
nd
Documenta
t
ion: Preliminary docs on 'git n
o
tes me
r
ge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herlan
d
git notes merge: Add
a
utomatic conflict reso
l
ver
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
o
tes merge: Han
d
le real, non-conflicting
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/n
o
tes
.
c: R
e
factor creatio
n
o
f
notes commit
s
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n Herland
gi
t
notes merge: Initial implem
e
ntation
h
andling tri
v
ial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
builtin/notes
.
c: S
p
lit notes
ref DWIMmery
i
nto a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
note
s
.
c: Use t
w
o
n
ewli
n
es
(instead o
f
o
ne)
w
hen concate
n
a
t
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
(trivial) t
3
303
:
Indent with t
a
b
s
instead of s
p
ace
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
notes
.
h/c: Pro
p
a
g
ate c
o
mbine_notes_fn r
e
turn value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c:
Al
l
ow comb
i
ne_n
o
t
e
s functi
o
ns to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
no
t
es
.
c: Re
o
r
der
f
uncti
o
ns in prep
a
ration
f
or n
e
xt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
no
t
es
.
h
: Make
d
efault_notes_ref() available in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(tri
v
ial) not
e
s
.
h: Minor documentation fixes to copy_note
s
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
not
e
s
.
c: Hex
i
fy S
H
A1 in die() message from init_notes
(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
rev
i
sion: T
u
rn off
histor
y
simplification in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
rev
i
sion:
Fix typo i
n
--
a
ncestry
-
path e
r
ror message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
oh
a
n Herland
Do
c
u
m
ent
a
t
i
on/rev-list-
o
ptions
.
t
xt
:
Ex
p
l
a
in -
-
ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
o
cumentation/rev-list-
o
pti
o
ns
.
txt: Fix
m
i
s
sing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Jo
h
a
n
H
er
l
a
n
d
diff
.
c: En
s
ure "index $from
.
.
$to" line cont
a
in
s
un
a
mbiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
built
i
n-notes:
Minor (mo
s
t
ly parse_option
s
-rela
t
ed
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herla
n
d
sub
m
odule s
u
mmary: Don't ba
r
f when invoked in an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-notes: Ad
d
"copy" subcommand for
copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n
-note
s
: Mi
s
c
.
refactoring
of argc and exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herlan
d
built
i
n-n
o
tes
:
Add
-
c/-
C
opt
i
o
n
s
f
or reusing notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-notes: Refactor han
d
ling of
-
F
optio
n
to
allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
builtin-notes: Deprecate t
h
e -m/-F opti
o
ns
fo
r
"git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-notes
:
Add "append" sub
c
ommand fo
r
appendin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
b
uiltin-notes: Add "add"
s
ub
c
ommand fo
r
adding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-
n
otes: Add --
m
ess
a
ge/--file
a
liases for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herland
built
i
n-note
s
: Ad
d
"
l
ist" subco
m
mand for lis
t
ing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Documentation
:
Generalize git-n
o
tes docs
to '
o
bjects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
bu
i
l
tin-notes:
A
d
d "prune" subcommand f
o
r re
m
o
v
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rlan
d
N
otes
A
PI: prune_no
t
es()
:
P
r
une no
t
es
tha
t
bel
o
ng to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
t3305:
V
erify that rem
o
ving notes t
r
i
ggers automa
t
i
c
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-not
e
s:
Add "remove
"
subc
o
mmand for remov
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erlan
d
Teach
b
uiltin-
n
ote
s
to remove empt
y
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Teach notes code
to
p
r
o
pe
r
l
y preserve non-notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
t3305
:
Verify
t
hat adding
m
any notes
w
i
t
h git-note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
l
a
nd
t3
3
0
1
:
V
e
r
ify successful
annota
t
ion of n
o
n-commit
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builti
n
-ify
g
i
t
-not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refactor notes c
o
nca
t
enation into a fle
x
ible interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
Notes
A
PI
:
Allow mult
i
ple co
n
cur
r
ent notes t
r
ees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
N
o
t
e
s API: write_notes_tr
e
e(): Store the notes t
r
e
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Note
s
API: for_each_note(
)
: Travers
e
the en
t
ire no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
N
o
t
es AP
I
: get_note(): Return the
note
annotatin
g
the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes
A
P
I: remove_
n
ote(): Rem
o
ve note objects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
N
ot
e
s API
:
add_note(
)
: Add note objects to
t
he internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: init_n
o
tes(): Initializ
e
the note
s
t
re
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Add tes
t
s for checking correct handling of
$
GIT_NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
Notes API:
g
et_comm
i
t_notes() -> format_note() + remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
Minor
c
osmetic fix
e
s to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan He
r
land
builtin-config: Fix crash
w
hen usi
n
g "-f <
r
elative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add more testcases to test
fast
-
i
m
po
r
t
of
n
otes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan
Herland
R
ename t
9
301 to
t9350, to
m
ake room for
more fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fa
s
t-i
m
po
r
t
: Proper notes tre
e
manipulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix
c
rasher on enc
o
untering SHA1-like non-n
o
te in notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan
H
erland
B
a
sic build
i
nfrastru
c
ture
for Py
t
hon scr
i
pts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
d
d self
t
ests verif
y
ing concatena
t
ion of multiple notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herlan
d
Refact
o
r
notes code to
c
o
n
cate
n
ate
multi
p
le no
t
e
s
a
n
nota
t
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
ha
n
Herland
Add selftests verify
i
ng
t
hat we can pars
e
notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach
t
he
n
otes
lookup code
t
o parse notes tree
s
wit
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach notes co
d
e to free its int
e
rnal d
a
ta structur
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Add flags t
o
get_commit_notes() to con
t
r
ol the format
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
t
3302-notes-index-expensive
:
Speed up crea
t
e_repo()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an H
e
rland
fast
-
import: Ad
d
support for importing commit no
t
es
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 ed
i
t"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
git clone: Add --recursive
to autom
a
tically c
h
eck
o
ut
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan H
e
rland
t7407: Use
'rev-parse
--sh
o
rt' rather than
bash's
s
ubst
r
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Joh
a
n
Herla
n
d
git submodule status: Add --recurs
i
ve to recurse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule up
d
at
e
: In
t
roduce --rec
u
rsive to update
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submod
u
le foreach: A
d
d
--recursive to re
c
urse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan
H
e
r
land
gi
t
s
ubmo
d
ule foreach: tes
t
access to subm
o
dule name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
A
d
d selftest f
o
r
'git submodule
f
ore
a
ch'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
H
erland
git s
u
bmodule: Clea
n
up usage string and add op
t
ion
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
Johan Herland
git submodu
l
e f
o
reac
h
: Provide access
t
o submodule
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
J
o
han Herland
help
.
c
:
g
ive correct structu
r
e's size
t
o
memse
t
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
Johan Herland
quickfetch(
)
: Prevent
o
verflow of the re
v
-list command
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan
H
e
rland
git-submodule: add sup
p
ort for --merge
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
J
ohan Herla
n
d
R
e
n
a
me submodule
.
<name>
.
rebase to submodule
.
<na
m
e>
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-04-18
Johan Herland
U
pdate do
c
s o
n
b
ehav
i
our of
'
core
.
share
d
Rep
o
s
itory
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-03-28
Johan
H
erland
Move chmod(foo, 0444) int
o
move_temp_to_f
i
le()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-29
Jo
h
a
n
H
er
l
a
nd
Use strchrnu
l
(
)
i
nstead of
strc
h
r()
p
lus manual wo
r
karound
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
Fix sub
m
odule sync with re
l
ativ
e
sub
m
odule URLs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Johan He
r
l
a
nd
for-each-ref:
F
ix --format=%(subject) for log mess
a
ge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-04
Johan
H
e
rla
n
d
Fi
x
A
sciiDo
c
e
rr
o
rs
in
me
r
ge docu
m
e
ntation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-02
Joh
a
n Herland
Bring lo
c
al clone's origi
n
URL in line with
that of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-08-21
Johan
H
erland
Teach "
g
it d
i
ff -p"
HTML funcna
m
e patterns
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
J
ohan
Herland
Teach "git c
l
one" to pack refs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
Johan H
e
r
l
and
Prepare te
s
tsuite for
a
"git
clone" that pac
k
s
r
efs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
Jo
h
an Herl
a
nd
Move pack
_
r
efs() and
f
rien
d
s int
o
l
i
bgit
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
Incorporate fetched packs in future object traversal
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-15
Jo
h
an Herl
a
n
d
The "curl" execu
t
ab
l
e
i
s no longer required
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next