repo.or.cz
/
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 'jc/prettier-pretty-note'
2012-10-21
Johan Herla
n
d
git
sy
m
bol
i
c-ref
--
d
e
le
t
e $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
and
n
ot
e
s-merge
:
Don't remove
.
g
it/NOTE
S
_
MERGE_WORK
T
REE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rland
notes-m
e
rge: use opendir/readdir i
n
s
t
ead of u
s
i
ng
read_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
ha
n
Herland
t3310: illustrate
failure to
"
n
o
tes merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
land
fast-import
:
Fix i
n
correct fanout level when mo
d
ifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
Herla
n
d
t9301: Add 2nd testc
a
se
e
xposing bugs in fast-im
p
ort
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rland
t9
3
01: Fix testcase
c
overing
u
p a bug
in fast-
i
m
p
o
rt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan H
e
rland
t5400: Fix
a
couple o
f
typo
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rla
n
d
Mark
d
irstat error messages for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
I
m
prove erro
r
han
d
ling when
par
s
ing
dirstat paramet
e
rs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New
--dir
s
tat=lines mode, doing dirstat ana
l
ysis b
a
s
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rl
a
nd
Allo
w
specifying
-
-d
i
r
stat cut-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add
c
onfig v
a
riable
f
or speci
f
y
i
ng
def
a
ult --dirst
a
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Refacto
r
--dirstat p
a
rsing; deprecate --c
u
mulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Make --dir
s
tat=0 outpu
t
directories that co
n
tribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
A
d
d se
v
eral testc
a
s
es f
o
r --dirstat
a
n
d
friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herl
a
n
d
--d
i
r
s
t
at
:
In case of
r
e
n
ames, use
t
arget filen
a
m
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herland
Teach --dirstat not to compl
e
tely ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--di
r
s
tat-by-
f
il
e
:
Ma
k
e it faster and more
c
o
r
rect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an He
r
land
--dir
s
tat:
D
escribe no
n
-obviou
s
di
f
f
e
re
n
ces
rel
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Ma
k
e
"
g
i
t not
e
s add" mo
r
e
u
s
e
r-fri
e
ndly
w
h
en
t
here
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Her
l
and
log
/
prett
y
-options:
Document --[no-
]
notes an
d
dep
r
e
cate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
J
o
han H
e
rland
bran
c
h/ch
e
cko
u
t --tr
a
ck: Ensure
t
h
at u
p
stream bra
n
c
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
o
han Herland
pus
h
.
de
f
ault: Rename 'tracking'
to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
and
Provide 'git merge --a
b
ort' as a synonym to 'git rese
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merge()
:
Parse
o
ptions
befo
r
e ch
e
ck
i
n
g
MERG
E
_H
E
AD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
Provi
d
e 'git notes
g
et-ref'
to easi
l
y
re
t
rieve
c
urrent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erlan
d
g
i
t notes merge: A
d
d t
e
stcases for merging
n
ote
s
tree
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herl
a
n
d
gi
t
notes m
e
rge:
A
dd
another auto-resolving
s
tra
t
egy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git not
e
s
merge:
--co
m
mit should fail i
f
und
e
rlyi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rl
a
nd
git n
o
tes merg
e
:
L
ist conflicting note
s
in notes me
r
g
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git
notes
m
erge
:
Manual
conf
l
ict resolution
,
part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
g
i
t not
e
s m
e
r
g
e: Manual conflict resolution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
an
d
Do
c
u
m
entation
:
Preliminary docs on
'
git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herl
a
nd
gi
t
no
t
es merge:
Add automatic con
f
lict r
e
solv
e
rs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git
notes merge
:
Han
d
le
real,
n
on-co
n
f
l
ict
i
n
g n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an
Herland
builtin/notes
.
c
:
Refa
c
tor creation of notes commit
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herl
a
nd
g
i
t notes mer
g
e
:
Ini
t
ial im
p
lementa
t
ion handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
H
e
rland
bui
l
tin/notes
.
c: Spl
i
t notes ref DWIMmery in
t
o
a separ
a
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
not
e
s
.
c: Use
two newli
n
es (in
s
tead of
one) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
(trivial) t3303: Indent with ta
b
s instead o
f
spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
notes
.
h/
c
: P
r
opagate combine_note
s
_fn
r
etur
n
valu
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c: Allow combi
n
e
_notes
fun
c
tion
s
to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
n
o
tes
.
c: Reorder functions in prepa
r
ation f
o
r n
e
xt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
ha
n
Herlan
d
notes
.
h
: Make default_notes_
r
ef()
available in not
e
s
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan H
e
rland
(trivial) not
e
s
.
h: Minor documentation fixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n He
r
land
not
e
s
.
c: Hexify SHA1 in di
e
() message fr
o
m ini
t
_not
e
s()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
ohan Herland
note
s
: Don't creat
e
(empty
)
commit when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Ena
b
le cu
s
tom sche
m
es for
column colors in the g
r
aph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
ohan Herland
Make graph_
n
e
x
t_line()
availa
b
le in
t
he graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
revision: Turn of
f
history
simplification in
--anc
e
str
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
ha
n
Herl
a
nd
revision: Fix typo in --ancestry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
land
D
ocumen
t
ati
o
n/
r
ev-l
i
s
t
-optio
n
s
.
txt: Expl
a
in --
a
ncestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herla
n
d
Documen
t
at
i
on/re
v
-list-options
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herl
a
nd
diff
.
c: Ensure "index $f
r
om
.
.
$to
"
line co
n
tains un
a
mbiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
b
u
i
ltin-notes: Minor (mostly pa
r
se
_
o
p
tions-relate
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
ohan Herl
a
nd
submod
u
l
e
summa
r
y: D
o
n't barf
w
hen invo
k
ed
i
n an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
a
n
d
builtin-no
t
es
:
Add "co
p
y" subcomman
d
for copying not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
b
uiltin-notes: Misc
.
r
efactorin
g
of argc and exit val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
buil
t
in-no
t
es
:
Add -c/-C options for re
u
sing n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-no
t
es: Refactor handling of -F option t
o
allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes: De
p
recate the -m/-F options for "
g
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
builtin-note
s
:
A
dd "append" subco
m
mand for ap
p
e
nding
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
b
uiltin-notes:
Add "add" su
b
command fo
r
adding no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
buil
t
in-notes: Add --message/--file aliases f
o
r -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
bu
i
ltin-note
s
:
Add
"li
s
t
" su
b
comma
n
d for listi
n
g note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
Do
c
umentation: Gen
e
r
a
lize git-notes doc
s
t
o
'objec
t
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
r
land
builtin-n
o
tes
:
A
d
d "prune
"
subc
o
mman
d
for
r
e
m
o
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: prune_notes(): Pru
n
e
n
otes th
a
t bel
o
ng
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3
3
05: Verify that removing notes trig
g
ers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
buil
t
in-notes: Add "remove"
s
ubc
o
m
m
and for remov
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Te
a
ch bu
i
ltin-
n
otes
to remov
e
e
mpty
not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
T
e
ac
h
notes
c
ode
t
o properl
y
preserv
e
no
n
-n
o
tes i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
t3305: Ver
i
f
y that
a
dding many notes
with git-note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
and
t3301
:
Verify s
u
ccessf
u
l annotatio
n
of non-
c
omm
i
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Builtin-i
f
y git-
n
o
t
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Refactor
n
otes concatenation int
o
a flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herlan
d
Note
s
API: Allow mul
t
i
p
l
e
concur
r
e
n
t notes tr
e
es with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes API: write_notes_tree
(
): Store
t
h
e notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes A
P
I: for_ea
c
h_n
o
te(): Traverse
t
he entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API
:
get_
n
o
t
e
(
): Return the not
e
annot
a
ting the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
N
o
tes API: remove_n
o
te(
)
: Remove note
objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Notes
API: add_note
(
):
A
dd
n
ote obje
c
ts
t
o the internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: init
_
notes(): I
n
itialize
the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Ad
d
tests
f
o
r
checking correct h
a
ndling of $GIT_
N
OTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
H
erland
Notes API: get_commit_notes
(
) ->
f
o
r
mat_no
t
e() + rem
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Minor
c
osmetic
fixes to n
o
t
es
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
o
han Herland
b
u
iltin-c
o
nfig: Fix crash when
u
s
i
ng "-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an H
e
r
land
Add
m
o
r
e testcase
s
to
t
e
st fast-import of n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
h
an Herland
R
e
name
t
93
0
1
to t
9
350, to make room for
m
ore fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han
Her
l
and
f
a
st-impo
r
t: Proper notes tree
m
anipula
t
io
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
J
ohan H
e
rland
Fix cr
a
sher on
e
ncountering S
H
A1-like non-note in n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan
H
erland
Bas
i
c bu
i
ld infrastruc
t
ure
f
or Python scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Add selftests v
e
r
i
fying concat
e
natio
n
of m
u
l
ti
p
le note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n
Herland
Refactor notes code to
c
oncatenate multiple no
t
es a
n
not
a
ting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Her
l
a
nd
Add s
e
lf
t
ests verifying th
a
t we
can parse not
e
s trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Her
l
and
Teach
t
h
e not
e
s lookup
code
t
o parse notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
T
e
a
ch notes code to f
r
ee its int
e
rn
a
l data
structu
r
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herland
Add
flags to get_commi
t
_notes
(
) to con
t
rol the
forma
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t3
3
02
-
notes
-
index-expensive: Speed up create_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next