repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
index-pack: show histogram when emulating "verify-pack -v"
2011-02-16
Johan Herla
n
d
push
.
default:
R
e
n
ame
'
t
r
acking'
to
'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git merge --abort' as
a
synonym
to
'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merge(): Parse options before
c
hec
k
ing ME
R
GE_H
E
AD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
Provide 'git notes
get-ref'
t
o easily retrieve c
u
rrent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merg
e
: Add
t
estcases
f
or mer
g
ing not
e
s
t
rees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
Herl
a
n
d
git notes merg
e
: Add another auto-resolving
s
tra
t
e
gy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
n
ot
e
s merge: --commit shou
l
d fail
i
f underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herl
a
nd
git
notes merg
e
: List confl
i
cting
notes
i
n notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
note
s
m
e
r
g
e: Manual confli
c
t re
s
olution, p
a
rt 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
no
t
e
s
m
erge: Man
u
al conflict resolution, part 1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n He
r
land
Do
c
u
men
t
a
t
ion:
P
r
elim
i
n
ary docs on
'
git
no
t
es merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
erge: Ad
d
automati
c
con
f
lict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
git
n
otes merge: Handle real, non-
c
onfli
c
t
ing notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
builtin/notes
.
c: Re
f
acto
r
creation o
f
no
t
es
c
ommits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git notes merge: Initi
a
l impl
e
mentation ha
n
dli
n
g t
r
ivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
b
u
il
t
in/
n
o
tes
.
c: Split notes ref DWIMmery i
n
to
a
separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
notes
.
c: Use
t
w
o newlines (instead of
o
ne) wh
e
n
c
oncat
e
n
a
tin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
(triv
i
al) t3303: Inde
n
t with tabs
i
nstead
o
f
spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
note
s
.
h/c: Propaga
t
e combine_notes_fn
return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
notes
.
h/c: Allow combi
n
e_notes funct
i
ons to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herl
a
nd
notes
.
c:
R
eorder funct
i
o
ns in p
r
eparation
for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
n
o
tes
.
h:
M
a
ke def
a
ult_notes_ref
(
)
a
v
ailable
in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herlan
d
(tr
i
vial)
note
s
.
h
:
Minor
documentation f
i
xes
t
o
c
o
py
_
n
o
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
n
otes
.
c: Hexify
SHA1 in die() mes
s
age
from init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes:
Don't
create (empty)
c
ommit w
h
e
n
removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herla
n
d
Enab
l
e custom
schemes
for
column co
l
ors
in the
grap
h
AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n H
e
rl
a
nd
Make graph_next_line() avail
a
ble in the graph
.
h A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
r
e
vi
s
i
o
n: Turn off hi
s
tory si
m
pli
f
i
cation in
-
-an
c
estry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: F
i
x t
y
po in --ancestry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
He
r
land
Docume
n
tation/rev-list-op
t
ions
.
tx
t
: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n
Herl
a
n
d
D
o
cume
n
tation/rev-list-opt
i
ons
.
txt:
F
ix missing l
i
ne
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan
Herlan
d
diff
.
c: Ens
u
re
"
index $from
.
.
$to"
l
ine c
o
ntains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Joh
a
n He
r
lan
d
builti
n
-notes:
Minor (mostly
p
arse
_
opti
o
ns-rel
a
ted
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan He
r
land
s
ubmo
d
ule summary: Don't barf when invo
k
e
d in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-notes:
Add
"co
p
y" subcomma
n
d for c
o
pying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
o
tes: Mi
s
c
.
refacto
r
ing of argc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-notes: Add
-c/-C options
f
o
r reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
r
l
and
built
i
n
-no
t
es: Refact
o
r handling of -F option
t
o
allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-notes:
D
epre
c
ate the -m/-F
opt
i
ons for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herlan
d
builtin-not
e
s: Add "append"
s
u
bcommand f
o
r appendi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-
n
otes: Add "add" subcomma
n
d for adding
no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
l
and
builtin-notes: Add -
-
me
s
sage/--file aliases for -
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
e
rl
a
nd
b
u
iltin
-
n
o
tes
:
Ad
d
"list" subcommand for
l
isting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
D
o
c
u
mentation
:
Gen
e
ral
i
z
e
g
i
t-notes docs t
o
'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
buil
t
in-notes: A
d
d "prun
e
"
subco
m
m
a
nd
for rem
o
ving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
prune_notes(): Prune notes that
b
elong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
r
l
a
n
d
t3
3
05: Verify tha
t
r
e
moving notes triggers
automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-notes
:
Add "remove" subc
o
mman
d
for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Teach builtin-notes to remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach notes code to properly prese
r
v
e
non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
t330
5
: Ve
r
ify that adding many note
s
w
ith
g
it-no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
nd
t
3301: Ver
i
fy suc
c
essful
annota
t
ion of
n
on-
c
ommits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
Builtin-ify gi
t
-note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Re
f
actor notes conca
t
e
nat
i
on in
t
o a flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s A
P
I
:
Allow mu
l
tiple concurrent note
s
trees w
i
th
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
Notes
A
P
I: write_notes
_
t
re
e
(): St
o
re the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
and
No
t
es A
P
I
:
f
or_each_note(): Tra
v
erse
t
he enti
r
e notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herlan
d
Notes API:
g
et_note():
R
etu
r
n
the note
annotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes API: remo
v
e_note(): Remove note
objects fr
o
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herl
a
nd
No
t
es
API:
a
dd_note(): Add note ob
j
ects
t
o the internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API: init_notes(): Initialize
the
n
o
t
e
s
t
ree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
Add tests for checking correct handli
n
g of $G
I
T_
N
OT
E
S_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Not
e
s API: get_commit_n
o
tes() -> format_n
o
te() + r
e
mo
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Min
o
r cosmetic
fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herla
n
d
builtin-c
o
n
f
ig: Fix crash when using "-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
A
d
d more
t
estcases to te
s
t fast-import of
n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Ren
a
me t93
0
1 to t9350, t
o
make room for more fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an Herland
fast-import:
Proper notes t
r
ee mani
p
ulati
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
J
o
han
Herland
Fix crasher
on en
c
o
u
nte
r
ing SHA1-like non-note
in
note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
B
asic
b
uild infrastr
u
ctu
r
e for P
y
thon scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Add selftests verifying concatenation
o
f
multiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Refa
c
tor notes code to concaten
a
te mult
i
ple not
e
s anno
t
ating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add selftes
t
s verifying that we c
a
n parse no
t
es trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han H
e
r
l
and
Te
a
ch the note
s
lo
o
kup code to parse not
e
s tre
e
s
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Herland
Teach note
s
code
to f
r
ee its
internal
data structu
r
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
d
d
f
lags to g
e
t_comm
i
t_notes() t
o
c
on
t
rol the
for
m
at
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
t3302-notes-index-
e
xpensive:
S
pee
d
up create_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han H
e
r
lan
d
fas
t
-import: Add support fo
r
import
i
ng
commit not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
l
and
Tea
c
h "
-
m
<
msg>" and
"-F <file>" to
"git
n
ot
e
s e
d
it"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Joh
a
n
Herland
git c
l
one: Add --recursi
v
e to automatic
a
lly
chec
k
out
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan
H
erland
t7407: Use
'rev
-
p
arse -
-
shor
t
'
rat
h
er than bash
'
s substring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submo
d
ule statu
s
:
A
dd -
-
recursive to recurse
i
nto
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
H
e
rl
a
nd
git submodule update
:
Intr
o
duce --rec
u
rsive
t
o update
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan
He
r
land
git s
u
bmod
u
le for
e
ach
:
Add --recu
r
s
i
v
e to
recurse
i
nt
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an He
r
l
a
nd
git
s
ubmodul
e
foreach:
test a
c
c
ess to submo
d
ule name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herla
n
d
Add selftest
f
or 'git submodule f
o
reach'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git subm
o
dule: Cleanup usage string and
add option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
J
o
h
an H
e
r
l
a
nd
git submodule forea
c
h: Provide acce
s
s to
s
ub
m
odule
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan
H
erland
help
.
c: give
correc
t
structure's
s
ize
t
o
memse
t
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan Herland
qu
i
ckfe
t
ch
(
): Prevent overflo
w
of the
rev-list command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Joh
a
n Herland
git-
s
ubmod
u
l
e: add
support for --
m
er
g
e
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
o
h
a
n Her
l
a
nd
Rename
s
ubmodule
.
<name>
.
rebase to
submod
u
le
.
<
n
a
me
>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
J
ohan Herland
Update docs o
n
behaviour of 'cor
e
.
sharedRepo
s
itory
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herland
Move chmod(foo, 0
4
44) into move_temp_to_file()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Johan
Her
l
and
Use
s
t
r
ch
r
nul(
)
instead
o
f
s
trchr
(
)
p
l
us
manual workaro
u
nd
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan
H
erland
Fix su
b
module
s
ync wit
h
re
l
a
t
iv
e
submodule URLs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herl
a
nd
for-
e
ach-ref: Fix --format=%(subject) fo
r
log m
e
ssage
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Johan Herland
F
i
x AsciiDoc
errors in merge documen
t
ation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
Johan Herla
n
d
Bring local clone's ori
g
in URL i
n
l
ine wi
t
h th
a
t of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
J
o
han H
e
rl
a
nd
Teach "
g
it d
i
ff -p" HTML funcname patte
r
n
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next