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 'mg/replace-resolve-delete'
2012-10-21
Johan H
e
rland
git symbolic-ref --delet
e
$symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herl
a
nd
notes-mer
g
e: Don't remove
.
git/NOTES_MERGE_WORK
T
REE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
H
e
r
l
and
notes-mer
g
e: use op
e
ndir/readd
i
r in
s
tead of u
s
ing
read_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan He
r
land
t
3310
:
illustrate failure to "no
t
es merge --c
o
mmit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an
H
e
rland
fa
s
t-import: Fix incorrect f
a
nout level
when mod
i
fying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herland
t93
0
1:
Add 2nd
t
e
st
c
ase
e
x
posi
n
g
b
ugs i
n
f
a
s
t
-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301
:
F
i
x t
e
stcase covering up a bug in
fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix a c
o
uple
o
f typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herla
n
d
Mark dirstat er
r
or mes
s
age
s
f
or translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Imp
r
ove err
o
r han
d
ling when p
a
rsing dirstat p
a
rameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
New --dirstat=
l
ines
m
ode, doing dirstat analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow specifying
--dirstat c
u
t-off percentag
e
as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Add config
v
ariable f
o
r spec
i
fying
default -
-
dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
a
n Herland
Refactor --dirs
t
at parsing; deprecate --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Make
-
-dirstat=0 out
p
ut directories that contr
i
b
u
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add several tes
t
cases for --d
i
rstat and frien
d
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herlan
d
--dirstat: In ca
s
e of
r
e
n
ames, use target fil
e
name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
T
each -
-
dirstat not to comple
t
ely
ignore r
e
arrange
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
a
n H
e
r
l
and
--
d
irs
t
a
t-b
y
-file: Make it faster and m
o
r
e c
o
rrec
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
nd
--dirstat: Describe non-ob
v
ious differences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
M
ake "git no
t
es add" more
u
s
e
r-friendly wh
e
n ther
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Her
l
and
log/pretty-options: Do
c
um
e
nt --[n
o
-]notes and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joha
n
Herland
branc
h
/
c
heckout --
t
rack: Ens
u
re that up
s
tream bran
c
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
def
a
ult: Ren
a
me 'tr
a
cking' to
'upstr
e
am'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git merge --
a
bo
r
t
'
as a synonym to
'
git
r
ese
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
lan
d
cmd_merge(): Pa
r
se options
before checking ME
R
GE_
H
EAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
Provide 'git notes g
e
t-ref' to easily retr
i
e
ve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
g
it notes m
e
rge: Ad
d
tes
t
cases for
merging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge
:
Add another a
u
t
o
-resolving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
gi
t
notes
m
erge: --c
o
mmit
s
ho
u
l
d
fail if u
n
de
r
l
yin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git
notes merge
:
List conflic
t
ing
n
o
t
es i
n
n
o
tes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes merg
e
: Manua
l
conflict res
o
lution, pa
r
t 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
not
e
s merge: Manu
a
l conf
l
ict reso
l
ution, part
1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
Documenta
t
i
on:
P
r
eli
m
inary d
o
c
s
on 'git notes me
r
ge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add automatic conflict
r
esolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rla
n
d
git
n
ot
e
s merge
:
Handle re
a
l, non
-
conflic
t
ing notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
b
u
ilt
i
n/n
o
tes
.
c: Refa
c
tor cr
e
a
t
io
n
of notes com
m
its
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merg
e
: Initial imple
m
enta
t
ion
h
a
n
dling trivi
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
He
r
land
built
i
n/no
t
es
.
c: Spl
i
t notes ref D
W
IMmery into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
not
e
s
.
c: Use two newlines (
i
nstead of one) when conca
t
e
natin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial) t3303: Indent w
i
th ta
b
s instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
otes
.
h
/
c
: Propagate combine_
n
ote
s
_fn
r
eturn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herl
a
nd
notes
.
h/c: Allow combine_note
s
functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
no
t
es
.
c
:
R
e
order f
u
nctions in preparation fo
r
ne
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Her
l
a
n
d
notes
.
h
:
Make d
e
fau
l
t_n
o
tes_ref() avail
a
ble in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(
t
riv
i
al)
notes
.
h: M
i
nor documentation fixe
s
to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
lan
d
not
e
s
.
c
:
H
exify S
H
A1
i
n die() mes
s
age
from init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
ohan
H
erl
a
nd
no
t
e
s
: Don't create
(
em
p
ty) commit whe
n
remov
i
ng non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n Herland
Enabl
e
c
ustom schemes for c
o
l
umn colors
in the graph AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make graph_
n
ext_line() a
v
ailable
i
n
the
graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
revision
:
Turn off history s
i
mplification
i
n
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
r
evision
:
Fix typo
i
n --an
c
est
r
y-
p
a
t
h
e
rror
m
essage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
Documentation/rev-l
i
st-options
.
txt: Expla
i
n -
-
ancest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
Do
c
ument
a
t
i
o
n/rev-lis
t
-opt
i
o
ns
.
txt:
Fix m
i
ssi
n
g
line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herlan
d
d
iff
.
c:
E
nsure "index $from
.
.
$t
o
" line
conta
i
ns unambi
g
uou
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herlan
d
builtin-n
o
t
e
s
:
M
inor (mostly
p
arse_opti
o
ns-
r
elated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
subm
o
dule summary
:
D
o
n't barf when invoked
in an
e
mpt
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
n
d
bui
l
tin-no
t
es: Add "copy
"
subcommand for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
b
ui
l
tin-n
o
t
es: Misc
.
ref
a
ctoring of argc an
d
exit val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
bui
l
tin-notes: Ad
d
-
c/-
C
options for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes: Refac
t
or h
a
ndling of -
F
option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-notes: Deprecate the -m/-F
o
ptions for
"git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
builtin-no
t
es:
Add "appen
d
" subcommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
t
e
s:
Add "add" subc
o
mman
d
f
o
r addin
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-notes: Add --message
/
--file alia
s
es fo
r
-m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
bui
l
tin-notes: Add "list" su
b
command for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
land
D
o
c
u
mentation:
Generalize git-not
e
s docs t
o
'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes:
Add
"
pru
n
e
"
subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
Notes API: prun
e
_notes(): Pr
u
ne
no
t
es that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erla
n
d
t3305: Verify tha
t
removing no
t
es
triggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
notes: Add "remo
v
e" s
u
bcommand
f
o
r removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Teach
built
i
n-notes to remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Teach notes code to pr
o
perly preserv
e
non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t33
0
5: Verify t
h
a
t
adding many n
o
tes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
an
d
t
3301:
Veri
f
y
su
c
cess
f
u
l
a
n
n
o
t
ation of non-c
o
mmi
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Builtin-ify git-
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Refa
c
t
or no
t
es conc
a
te
n
ati
o
n into a flex
i
ble interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes API: Allow
m
ultip
l
e concurrent notes
t
r
ees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
Notes
A
PI: writ
e
_
notes_tree():
Store the
n
otes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
No
t
es
API: for_ea
c
h_note(): Traverse
the entir
e
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
Note
s
API: get_note(): Return th
e
note annot
a
ting
t
he
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
Notes AP
I
: r
e
move_note()
:
Remove n
o
te o
b
jects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: add_note()
:
Ad
d
n
o
te
o
b
jects to the i
n
t
ernal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Not
e
s API
:
init
_
no
t
es(): Initializ
e
the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
A
dd tests for checking
c
o
r
rect handling of
$
G
IT_NOT
E
S
_
REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
N
otes API
:
get_commit
_
notes() -> format_note() + remov
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
M
i
nor
c
osmetic fixes t
o
notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Jo
h
a
n
Herland
builtin
-
c
onfig: Fix crash when usi
n
g "-f <re
l
ati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han
He
r
land
A
dd more testcas
e
s
to test fast-import of
n
o
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Renam
e
t9301 t
o
t9350, to make ro
o
m for more
fast
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan Herland
fast
-
import: Proper notes tree manipul
a
tion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan
Her
l
and
Fix crasher on enco
u
nt
e
ring SHA1-like non-note in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Basic b
u
ild infra
s
tructure for Py
t
h
on script
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Add selfte
s
ts verif
y
ing concatenation of mult
i
p
le notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Refacto
r
notes code to conc
a
tenate
multiple n
o
tes anno
t
ating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
la
n
d
Add selfte
s
ts verifying
t
h
at we can parse notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Te
a
ch the no
t
es look
u
p
c
o
de to
parse notes trees
wit
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Her
l
an
d
Te
a
ch notes code to free its
interna
l
data struct
u
res
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herl
a
n
d
Add flags to get_c
o
mmi
t
_n
o
tes() to control the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
e
rla
n
d
t3302-not
e
s
-
in
d
ex-expensive:
S
peed up cre
a
te_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next