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
log/pretty-options: Document --[no-]notes and deprecate old notes options
2011-03-30
Johan Herl
a
n
d
log
/
p
r
etty-op
t
ion
s
:
D
ocume
n
t --[no-]notes and deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan He
r
land
b
r
a
n
ch/checkout --track: E
n
sure that up
s
tr
e
am branc
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
pus
h
.
default: Ren
a
me 'tr
a
cki
n
g' to '
u
pstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide
'
git merge
-
-abort'
a
s a syn
o
nym
to 'git
r
eset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Her
l
an
d
c
m
d_me
r
g
e
(): Parse
options before checki
n
g MERGE_
H
EAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Her
l
an
d
Provide 'git notes get-ref' to easil
y
retriev
e
current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git notes merge: Ad
d
t
e
stcases for m
e
rging
no
t
es trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
lan
d
git notes merge: Add another auto-resolv
i
ng strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git note
s
m
e
rg
e
: --commit sho
u
ld fail if
underl
y
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git no
t
e
s
m
erge: List
c
onfl
i
cting notes in n
o
tes
m
erge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herlan
d
gi
t
note
s
me
r
ge: Manual conflict resolutio
n
, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes
merge: Manual
c
onflict
resol
u
tion,
pa
r
t
1
/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan He
r
l
and
Docu
m
entati
o
n
: Preliminary docs on 'git notes
merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
e
rla
n
d
git no
t
es merge: Add au
t
omatic confl
i
ct resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes
m
erge: Handle real, non-conflicting notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
b
u
i
l
t
i
n/n
o
t
e
s
.
c: Refactor creation
of not
e
s commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
g
i
t
notes merg
e
: Initial impl
e
me
n
t
a
ti
o
n handling triv
i
a
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/
n
ot
e
s
.
c:
S
p
lit no
t
es ref
D
WIMmery in
t
o a
separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
not
e
s
.
c: Use two newline
s
(in
s
tea
d
of
one) when
c
onca
t
enatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
(t
r
ivial)
t3303: Indent
w
ith tabs instead of sp
a
ces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c: P
r
opaga
t
e combi
n
e_notes_fn return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rland
n
o
t
e
s
.
h/c:
Allow c
o
mbin
e
_
no
t
es fu
n
c
ti
o
ns to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
n
ot
e
s
.
c: Reorder function
s
i
n
prepa
r
ation for ne
x
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han H
e
rla
n
d
n
o
te
s
.
h: Make de
f
ault_not
e
s_ref() available in
n
o
t
es API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
(t
r
ivial) notes
.
h
:
M
i
nor
d
ocumentation fixes t
o
copy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: He
x
if
y
SH
A
1 in die() m
e
ssage from init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes
:
Don't create (em
p
ty)
commit when rem
o
ving non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an
Herland
Ena
b
le custom
s
c
hemes for colu
m
n
colors
in the graph A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make graph_n
e
xt_line() available in the
gra
p
h
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
revision: Turn off history simplific
a
tion in
--an
c
estry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
revision: Fix ty
p
o in --ances
t
r
y
-
p
ath error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
Documentation/r
e
v-l
i
s
t-opti
o
ns
.
tx
t
: Explain --
a
nces
t
ry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
D
ocumentat
i
on/re
v
-l
i
st-opti
o
n
s
.
txt: Fix mi
s
s
i
n
g line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Jo
h
an Herlan
d
diff
.
c: En
s
ure "i
n
de
x
$fr
o
m
.
.
$t
o
" li
n
e
co
n
tains
u
nambig
u
ous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Jo
h
a
n Herland
b
u
iltin-not
e
s: Minor
(mostly parse_options-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan
He
r
land
submo
d
ule summary:
D
on't barf when in
v
o
k
ed in an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "co
p
y
"
subco
m
ma
n
d for c
o
p
y
ing notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
bui
l
tin-notes: Misc
.
refactoring
of arg
c
and ex
i
t value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
t
in
-
notes: Add -c/
-
C o
p
tion
s
for
r
e
u
sing notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-n
o
tes:
Refactor handling of -F option to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builti
n
-notes: D
e
precate the -m/-F
optio
n
s for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
Add "append" subcom
m
and
f
or appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin
-
notes: Add
"
add" subcommand for a
d
ding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
builtin-no
t
es:
Add --
m
essage/--file aliases for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
buil
t
in
-
n
otes:
A
dd "list" subc
o
mmand for list
i
n
g
n
o
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herland
D
ocumentation:
Generalize git-notes docs
t
o 'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
builtin-not
e
s: Add "prune" s
u
b
c
ommand f
o
r remo
v
i
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes
A
P
I: prune_notes(): Prune no
t
es that belong
t
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
e
r
la
n
d
t
3305
:
Veri
f
y that re
m
oving notes triggers
a
utom
a
t
ic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
bu
i
ltin-no
t
es: A
d
d "
r
e
m
o
v
e" subco
m
mand for
r
emoving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Teach builtin-notes to remove
empty not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
Teach notes code t
o
pro
p
erly preserve non-notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
t3305: Verify that ad
d
ing many notes with git
-
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t33
0
1: Ve
r
ify
s
u
c
c
essful annotation
of non-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herl
a
n
d
Builti
n
-
i
fy git-no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
n
d
Refactor notes
c
o
ncatenation into a flexible interfac
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
Notes API: Allow m
u
l
t
iple concur
r
ent notes trees wi
t
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: write_note
s
_tree(): Stor
e
the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes
API: for_each_note(): Tr
a
ve
r
se the
entire
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes AP
I
:
get_n
o
te()
:
Return the note
a
n
n
o
t
a
ting the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
He
r
lan
d
Notes API: remove_not
e
(): Remove n
o
te objects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Note
s
API: add_note
(
):
A
d
d no
t
e
o
bjects to th
e
internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
N
o
t
e
s API: init_
n
otes(): Initialize the n
o
tes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
and
Add tests for checking correct handling
of $GIT
_
NOT
E
S
_
R
E
F
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes A
P
I: get_com
m
it_no
t
es()
->
format_note
(
)
+
r
e
m
ove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
M
i
n
o
r cosmetic fixes to note
s
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
J
ohan Herland
buil
t
in-co
n
fig: Fix crash when using "
-
f <relati
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add more
t
estcases to tes
t
fast-import o
f
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
e
r
land
Ren
a
me
t
9301 to t935
0
,
to m
a
ke room f
o
r
more fast-
i
mport
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n Herland
fast-import: Proper not
e
s tree manipulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Joha
n
Herl
a
nd
Fix
crasher on enc
o
unteri
n
g SHA1-like non-note in notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herlan
d
Basic buil
d
infras
t
ructure for Python
scripts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n H
e
rland
Add selft
e
sts verifyi
n
g conca
t
enation of mul
t
iple notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
R
efact
o
r no
t
es
cod
e
to con
c
at
e
nate multi
p
le no
t
es
annotatin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
n
d
Add selftests ve
r
ify
i
ng that we can parse not
e
s trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n
H
erland
T
e
a
ch the notes loo
k
up
c
od
e
to par
s
e
n
o
tes tree
s
with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rla
n
d
Teac
h
notes cod
e
t
o
free its internal data st
r
uc
t
ures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Ad
d
f
lags to get_c
o
mmit_no
t
es(
)
to control the fo
r
mat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
H
erland
t
330
2
-note
s
-index-expensive: Speed u
p
creat
e
_
repo()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
and
f
a
st-import: Add s
u
p
p
ort f
o
r
i
mport
i
ng co
m
mit notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herl
a
nd
T
e
ac
h
"-m <msg>
"
a
n
d "-F
<file
>
" to "git notes edit"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
git clone:
Add --re
c
ursi
v
e to au
t
omaticall
y
checkout
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
t7407: Use 'rev-pa
r
se --short' rather than bash's sub
s
tring
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git
s
u
bmodule status: Add --rec
u
rs
i
ve to recurs
e
into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodul
e
update: Intr
o
duce --
r
ec
u
rsive to update
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan He
r
l
a
n
d
gi
t
su
b
modu
l
e
f
o
r
e
ach: Add --r
e
cu
r
sive to recurse
i
n
t
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
r
l
and
g
it s
u
bmodule foreac
h
: test access to su
b
m
o
dule n
a
me
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
Add self
t
e
s
t
for 'git
s
ubmodu
l
e foreach'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan
H
erlan
d
git subm
o
d
u
le
:
Clea
n
up
usage strin
g
and add option
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
J
o
han Herl
a
nd
g
it submodu
l
e foreach: Provide acce
s
s to
s
ubm
o
dule
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
J
ohan Her
l
a
nd
help
.
c: give
correct struc
t
ure's
size to memset()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
Joh
a
n
H
erla
n
d
quickfetch(): Prevent ove
r
flow of the
rev-list
command
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
git-submod
u
le:
add s
u
pport for --merge
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
J
o
h
an
H
erla
n
d
R
ena
m
e s
u
bmodule
.
<name>
.
re
b
a
se
t
o
submodule
.
<name>
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-04-18
Johan
Herland
Update
docs on behavi
o
ur of 'core
.
sharedRepos
i
tory
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-03-28
Johan H
e
rland
M
o
ve chmod(foo
,
044
4
) into move_temp_to_file()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-29
J
o
han
Herland
Use
strchrnul() i
n
stead of st
r
chr
(
) plus manual workaroun
d
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
J
o
h
a
n Herland
Fix s
u
bmodule s
y
nc with rela
t
ive
sub
m
odule URLs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
for-each-ref: Fix --format=%(subjec
t
) for log message
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-04
Johan He
r
land
Fix
A
sciiDoc
e
rrors
in merge doc
u
mentation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next