repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
--dirstat: In case of renames, use target filename instead of source filename
2011-04-12
Joh
a
n Herland
-
-d
i
rs
t
at: In case of renames, use targ
e
t
filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
a
nd
Teach --dirstat not to completely i
g
no
r
e
rearr
a
nged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erland
--dir
s
tat-by-
f
i
l
e
: Make i
t
f
a
ster and m
o
r
e
corre
c
t
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--d
i
r
stat: Describe non-obvious differe
n
c
es rela
t
iv
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
J
ohan
H
erland
bra
n
ch/che
c
k
o
ut --track: Ensure
that upstream branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
J
ohan Herland
p
u
s
h
.
d
efaul
t
: Renam
e
'tracking' to 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
erla
n
d
Provide 'git merge --abort'
as a synonym to 'git r
e
set
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erland
cmd
_
merge(
)
: Parse option
s
before checking MERG
E
_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Pr
o
vide 'git notes ge
t
-ref' to easil
y
retrieve current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
git
n
otes merge: Add
t
e
stca
s
e
s
f
or merging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
git notes merge
:
Add anoth
e
r
auto-
r
esolving st
r
ategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: -
-
comm
i
t s
h
o
u
ld fail if und
e
rly
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herla
n
d
git notes merge: List conflicting notes in notes m
e
rge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n H
e
r
land
git
n
otes merg
e
: M
a
nu
a
l conflic
t
resolu
t
ion,
p
art 2/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herland
g
it notes mer
g
e: Manu
a
l conflict resolution, part
1/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herl
a
nd
D
o
c
ument
a
tion: Pr
e
l
iminary
d
ocs o
n
'git notes
me
r
g
e'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes m
e
r
ge: Add
a
utomatic conf
l
i
ct resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
g
i
t notes merge: Ha
n
dle re
a
l, non
-
c
o
n
f
licting
n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/not
e
s
.
c
:
Refactor c
r
eation of note
s
commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
notes merge
:
Initial im
p
lementation handling trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
builti
n
/n
o
tes
.
c: Sp
l
i
t
notes ref
DWIMmer
y
into a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
la
n
d
notes
.
c:
U
se
two newlines (
i
nstead of one) when concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial) t3303: I
n
d
e
nt with tabs instea
d
of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
notes
.
h/c: Prop
a
gate combi
n
e_notes_fn return va
l
u
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
n
o
tes
.
h/c
:
Allow com
b
ine_notes funct
i
ons
to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
c:
R
eorder
functions
in preparation for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
notes
.
h: Make default_n
o
tes_ref(
)
a
v
ailab
l
e in n
o
tes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
(t
r
ivial) n
o
t
e
s
.
h: Minor documentat
i
on fi
x
es to copy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
c: Hexify SHA1 in die() messa
g
e fr
o
m
init_n
o
te
s
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
no
t
es: Don't create (e
m
pty) commit when removi
n
g non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable custom s
c
hem
e
s for column
c
o
lors in
t
he graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Her
l
a
nd
Mak
e
graph_next_lin
e
() available in the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
land
r
e
vision: Turn o
f
f history simplifi
c
ation
in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
revi
s
i
on: Fix typo
i
n
-
-
a
n
cestry-
p
ath error
m
essage
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
ocumentation/rev-list-op
t
i
o
n
s
.
txt: E
x
p
lain
--an
c
estry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herlan
d
Document
a
tion/rev-list-op
t
ions
.
txt:
F
ix
m
issing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan H
e
rland
diff
.
c:
E
n
sure "ind
e
x $from
.
.
$to"
l
i
ne contains unambig
u
o
us
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Joha
n
Herland
b
u
i
l
tin-note
s
: Minor (mostly parse_o
p
t
i
o
n
s
-
relat
e
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodule
s
ummary:
D
o
n't barf when invok
e
d i
n
an emp
t
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
land
builtin-n
o
tes: A
d
d "copy" subcomm
a
n
d
f
or co
p
ying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: Misc
.
refacto
r
in
g
of argc and
e
xi
t
value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
lan
d
b
uilti
n
-notes: Add -
c
/-C opti
o
ns for
reusing notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
bui
l
tin
-
not
e
s: R
e
fact
o
r ha
n
dli
n
g of -F option to al
l
ow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
ilt
i
n
-not
e
s
: Depr
e
cate the -m/-F
o
p
tions for "
g
it
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-notes: Add "
a
ppend" subcommand
for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-n
o
tes: Add "add
"
subcom
m
and for
ad
d
ing no
t
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
nd
built
i
n-notes: Add --mess
a
ge/--file a
l
iases fo
r
-m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builti
n
-notes: Add
"
list" subcom
m
a
nd for listing n
o
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Docum
e
ntation: Generali
z
e git-notes
d
oc
s
to 'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes: Add
"
prune" subcom
m
and for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herla
n
d
Not
e
s API: p
r
une_n
o
tes(): Prune notes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verify that removing
n
o
tes triggers automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "r
e
mov
e
" su
b
command for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
T
e
ach builti
n
-notes to remove empty
n
ot
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Teach
n
ote
s
code
t
o
properly pre
s
erve non
-
notes i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
05: Ve
r
ify that adding
many notes with
git-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
nd
t3301: Verify successf
u
l
annotation of non
-
c
omm
i
ts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
Built
i
n-ify
git-no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Refactor no
t
es concatenation in
t
o a flexible interfa
c
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API: Allow
multiple
c
o
ncurrent notes tr
e
es w
i
th
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
l
and
Notes API: write_notes_tree()
:
S
t
o
re t
h
e
notes t
r
ee
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
Notes API: for_eac
h
_
n
o
t
e(): Trav
e
rse
t
he entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Not
e
s AP
I
:
get_note(
)
: R
e
turn the no
t
e
a
nnotatin
g
the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Not
e
s
API: remov
e
_n
o
t
e():
Remove note objects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes AP
I
:
a
dd_not
e
(): Add not
e
obj
e
c
t
s to the
interna
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API: init_notes():
I
niti
a
lize the
notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Add tests for chec
k
i
ng correct
h
andling of $GIT_N
O
TES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Not
e
s
API: get_co
m
mit
_
notes() -> format_note() + remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Minor co
s
me
t
ic
f
ixes to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Jo
h
an Herland
b
u
iltin-conf
i
g
:
Fix crash
when using "-f <relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add more
t
es
t
cas
e
s
t
o
test fast-
i
mpo
r
t of
no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9301 to t9
3
50, to mak
e
ro
o
m for
m
ore
fast-imp
o
rt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan H
e
rl
a
nd
fast-im
p
o
rt: Proper notes
t
re
e
manipulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
F
ix crasher on encountering SHA1-like non-note
in notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herl
a
nd
Bas
i
c
b
uild infrastructure
for Pyt
h
o
n scr
i
pt
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
a
n
He
r
land
Add s
e
lfte
s
ts verifying con
c
atenation
o
f
m
ul
t
iple notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
Refactor notes code to
c
oncatenate multi
p
le not
e
s ann
o
ta
t
i
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Add selfte
s
t
s verifying
that we can p
a
rse note
s
tr
e
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han
Herland
Teach the notes
lookup code to parse not
e
s
trees
wit
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach notes c
o
d
e
to fre
e
its internal data structures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herla
n
d
Add flags
to get_commi
t
_notes() to control the format
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
t
3
3
02-notes-index-ex
p
ensive:
S
p
e
e
d up create_rep
o
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
f
ast-import:
A
dd su
p
port
f
o
r impo
r
t
ing commit no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
and
Te
a
c
h
"-m <msg>" and "-F
<
file>" to "git
n
otes edit"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
git clone: Add
-
-recursive to aut
o
matically ch
e
ckout
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Jo
h
an H
e
rland
t7
4
07: Use
'
rev
-
p
a
r
se --sh
o
r
t' rather than bash's substrin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git subm
o
dule status: Add -
-
r
e
c
ursive
t
o recurse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan He
r
lan
d
git submod
u
l
e
update: Introduce -
-
recu
r
si
v
e to
u
pdate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herland
git submodul
e
foreach: Add --recursive to re
c
urse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git sub
m
odu
l
e foreach: test access to
s
u
b
modu
l
e
name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
Add
s
el
f
test for 'gi
t
submod
u
le foreach'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
He
r
land
git submodul
e
: Cleanup
u
s
a
g
e string and add option
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
Joha
n
Herlan
d
git sub
m
odule foreac
h
:
Provid
e
a
c
cess to submodule
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
J
o
han He
r
land
help
.
c: give
cor
r
e
c
t st
r
ucture's size to
m
e
m
set()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
J
ohan Herl
a
nd
q
u
i
ckfe
t
ch
(
): Prevent
overflow of
the
rev-list
c
ommand
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan Her
l
an
d
g
it-submodule: add support for -
-
merge
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
R
enam
e
submodul
e
.
<name
>
.
rebas
e
to submo
d
ule
.
<nam
e
>
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-04-18
Johan Herland
Update docs
o
n
behaviour of 'cor
e
.
sharedReposito
r
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-03-28
J
o
ha
n
H
e
rla
n
d
Move c
h
mod(f
o
o,
0
444) into
move_temp_to
_
f
il
e
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herla
n
d
U
s
e strchrnul() inste
a
d
o
f
str
c
hr() plus ma
n
u
a
l
workaround
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next