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
Merge branch 'en/merge-recursive'
2011-04-12
Johan Herland
--
d
i
rstat: In case of renames, use
targe
t
filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han H
e
rlan
d
Te
a
ch --dirs
t
a
t no
t
to co
m
p
l
etely
i
g
n
o
re
rear
r
ang
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirs
t
at-b
y
-file: Make it
f
aster
and more
c
o
rrect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
h
an Herla
n
d
--dirstat: Desc
r
ibe non-obvi
o
us
differences rel
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joha
n
Herla
n
d
b
r
a
nch/checkout
-
-
t
rack: Ensure that upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
oha
n
H
e
r
land
p
u
sh
.
default
:
Rena
m
e 'track
i
ng' t
o
'u
p
str
e
a
m
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
Provide 'git
m
erge --abort'
a
s a syn
o
nym to 'git
reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
c
m
d_m
e
rge(): Parse options before
c
hecki
n
g MERGE_HEA
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
Prov
i
de 'git
notes
g
et-ref' to e
a
sily retrieve curre
n
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
land
git
no
t
es merge: Add testcase
s
f
o
r
m
erging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git
n
otes merge:
A
dd another auto-resolv
i
ng strate
g
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git
notes merge: --commit sh
o
uld
f
ail if underl
y
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Her
l
and
git notes me
r
ge: List conflicting not
e
s
i
n notes
m
erge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git
n
otes merge: Manual conf
l
ict res
o
lutio
n
, pa
r
t 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herla
n
d
g
it notes merge: Manual
confli
c
t res
o
lution, par
t
1
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
an
d
Documentation: Pre
l
iminary
d
ocs on 'git no
t
e
s
merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merg
e
:
A
dd a
u
t
o
matic conflic
t
reso
l
vers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n
Her
l
a
n
d
git notes merge
:
Handle real, non-
c
o
nflictin
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
bui
l
ti
n
/n
o
tes
.
c: Re
f
actor creati
o
n of no
t
es com
m
its
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herland
g
i
t not
e
s m
e
rge: In
i
tial
implement
a
tion handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herlan
d
builtin
/
no
t
e
s
.
c: Split no
t
es
r
ef DWIMmery into a se
p
arate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
notes
.
c: Use two
n
e
wlines (instead of
one) when conca
t
enati
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
a
nd
(tr
i
vial) t33
0
3: Indent wi
t
h
t
abs i
n
stead of
s
paces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
not
e
s
.
h/c: Propag
a
te combine
_
notes
_
fn retur
n
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c: Allow combi
n
e_no
t
e
s
fu
n
ctions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herla
n
d
notes
.
c: Reor
d
er functions in p
r
eparation for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
note
s
.
h: M
a
ke default_no
t
e
s
_ref(
)
available in
n
otes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial)
n
otes
.
h: Minor document
a
ti
o
n
fixes to
c
o
p
y_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c
: Hexify SHA1 in die
(
)
m
ess
a
g
e
f
rom init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Do
n
't create (
e
m
p
ty) commit
w
h
en
r
e
moving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
land
Enable custom schemes
for colum
n
colors in
the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an
H
e
rland
Make graph_next_line() avail
a
ble
i
n
t
h
e graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Her
l
and
revision: Turn
o
f
f hi
s
t
o
ry simplific
a
tion in -
-
ances
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fix typ
o
in --ancestry-path error
m
essa
g
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an
H
e
r
la
n
d
Documentation/rev-list
-
options
.
txt: Exp
l
ai
n
--ances
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docume
n
tati
o
n/rev-list-opti
o
ns
.
tx
t
:
F
i
x mi
s
s
i
ng
li
n
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herlan
d
d
i
ff
.
c: Ensure "index $from
.
.
$
to
"
line contains
u
nambiguou
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herlan
d
builtin
-
n
o
te
s
:
M
inor (mostly parse
_
o
ptions-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
Herland
submo
d
u
l
e summary: Don't barf
w
h
e
n invoked in an empt
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
ilt
i
n-not
e
s:
A
dd "cop
y
" subcomma
n
d for copyi
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Misc
.
ref
a
ctoring
of argc and exit
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes: A
d
d -c/-C options for
r
e
u
s
i
n
g not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Refactor handling of
-F option to allo
w
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
Herland
bu
i
ltin-notes: Depr
e
cate the
-m/
-
F
o
p
t
i
ons for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
builtin-notes: Add "
a
p
p
e
nd" subcommand for appen
d
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-no
t
es:
A
d
d
"
a
dd" subcommand fo
r
adding not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
tes: Add --message/--file alias
e
s f
o
r -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-notes: Add "list
"
subcommand for lis
t
i
ng note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Document
a
t
i
o
n
: G
e
n
e
ralize git-notes
d
ocs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
i
ltin
-
notes: Add
"prune" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
N
otes
API:
p
r
une_notes()
:
Prune notes
t
hat belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t3305: Verify that removing notes triggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
builtin-no
t
es
:
Ad
d
"remove" subcommand
f
or
removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
T
e
a
ch builtin-notes to remove
e
mpty no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
T
each note
s
c
o
d
e to properly p
r
es
e
r
ve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
t3305: Ver
i
fy that
addin
g
many
no
t
es with git-not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
an
d
t
3
301: Verify suc
c
e
s
sful annota
t
ion of
non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Bu
i
lt
i
n
-ify git-n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Re
f
actor not
e
s conc
a
tena
t
i
o
n into a flexible
i
n
t
e
rface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
Notes
A
PI: All
o
w mul
t
iple concurrent
n
otes
t
ree
s
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
rland
Notes A
P
I
:
write_no
t
es_tree(): Store the no
t
e
s
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
es
API: f
o
r_each_note(): Trav
e
rse the entire
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Not
e
s
A
PI: get_note
(
):
R
eturn the note annotatin
g
the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: remove
_
note(): Remove
note objec
t
s fr
o
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
N
otes API: add_note(): Add note objects to the
internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Notes API: init_notes():
Initialize the
notes tre
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Ad
d
tests for checking correct handling of $GIT_
N
OTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API
:
get_c
o
mmit_note
s
() -
>
format_note()
+ rem
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Minor
c
o
s
met
i
c
f
i
xes to
n
o
t
e
s
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
ohan Herland
b
u
iltin-conf
i
g: Fix crash when usi
n
g "-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herla
n
d
Add more
testca
s
es to t
e
s
t
f
a
st-import
o
f
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
a
n Herland
Rename t9301
to t9350,
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 Herland
fa
s
t-import: Pr
o
p
e
r n
o
t
e
s
t
r
ee ma
n
ipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan H
e
rland
Fix crasher
on e
n
countering SHA1-like n
o
n
-
n
ote
in not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
J
o
han Herland
Basic build infr
a
s
t
ructure f
o
r Python
scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herla
n
d
Add selftests verifyin
g
concatenation of multiple no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Refacto
r
note
s
code to concatenate
multiple notes anno
t
ati
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Add
selft
e
sts verifying that
w
e can pars
e
notes
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach the not
e
s lookup c
o
de to pars
e
no
t
es trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herla
n
d
Teach notes code to
f
ree it
s
internal data
s
tructures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
Add
f
lags to get_commi
t
_
n
ot
e
s
() t
o
control the for
m
at
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t3302-note
s
-
i
n
dex
-
expensive: Speed up c
r
e
a
te_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erla
n
d
fast-import: Add
s
u
p
p
o
rt
f
or im
p
orting commit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
T
e
ach "-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
gi
t
clone
:
Add
-
-recursive
to
autom
a
tically checkout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Joha
n
Herland
t740
7
: Use
'
rev-parse --short' rather than bash's subs
t
r
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submo
d
ule statu
s
:
Add -
-
recursiv
e
to recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an H
e
rl
a
nd
git su
b
module update: Introduce
-
-recu
r
sive to u
p
date
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rland
git s
u
b
module foreach: Add --recursi
v
e t
o
recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Her
l
and
g
i
t submodule
foreach: test access to submodule name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herland
Add selftest f
o
r 'git submodule foreach'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Her
l
a
n
d
git submodule: Cleanup u
s
age
strin
g
a
n
d add op
t
ion
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Jo
h
an Herland
git submodu
l
e foreach: Provide access
to
s
u
bmodul
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan H
e
rland
help
.
c
: give correct structure's size
t
o m
e
mset()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan Herland
qu
i
c
k
fetc
h
(): Prevent ov
e
rflow o
f
the re
v
-list comm
a
nd
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
g
i
t-submodule: add support for --merge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herla
n
d
Rename submodule
.
<na
m
e>
.
r
ebase to submodule
.
<name
>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Johan
H
erland
Update
docs on
b
ehaviour of 'core
.
sharedRepo
s
itory
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Johan H
e
rl
a
nd
M
o
ve
chmod(foo, 04
4
4) into mo
v
e_temp_to_file()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herland
U
s
e str
c
hrnul() instead of str
c
hr() plus manu
a
l workaround
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next