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
Sync with 1.8.0.1
2012-10-21
Johan
H
erla
n
d
gi
t
sy
m
bolic-ref --delete
$symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
and
notes-m
e
rge: D
o
n
't remo
v
e
.
git/NOTES_MERGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han He
r
l
and
not
e
s-mer
g
e: use o
p
endir/readdir
instead o
f
using read_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t3310: illustrate failure to "no
t
e
s m
e
rge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
fast-im
p
ort: F
i
x incorr
e
ct fanout level whe
n
modify
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an Herland
t9301: Add
2nd testcase exposing
bugs in fast-i
m
port
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herland
t9301: Fix testcase covering
up a bug
i
n fast-im
p
ort
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan
Herland
t540
0
: Fix a couple o
f
ty
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark di
r
stat
error messages for t
r
ans
l
ation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
I
m
prove error han
d
ling
w
hen
pa
r
sing dir
s
tat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an He
r
l
and
N
ew --di
r
stat=l
i
nes mod
e
, doing dirstat
an
a
l
ysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
H
erland
A
l
low specifying --dirstat cu
t
-off per
c
en
t
a
ge
a
s a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
A
d
d
c
onfig vari
a
ble for
specifying default --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Refactor --dirstat parsing;
d
eprecate --cumu
l
ative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Make --d
i
r
stat=0 output
d
irectories
t
h
a
t
contri
b
ute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Add seve
r
al testca
s
es for --dirstat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n Herland
--dirstat: In
c
ase
o
f renames, use target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herlan
d
Te
a
c
h
-
-dirstat not
to c
o
mplete
l
y
ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an Herla
n
d
-
-dirstat
-
b
y
-file
:
Make
it faster and m
o
re correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herlan
d
-
-dirstat: Describe no
n
-o
b
vious differences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n Herlan
d
M
ake
"
g
i
t no
t
e
s
add" mor
e
user-friendly
w
hen
t
here
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/pretty-options:
D
ocum
e
nt
--
[
no-]not
e
s
a
nd
depr
e
c
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan H
e
rland
branch
/
checkout --track: Ensure that upstream
branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herlan
d
push
.
d
e
f
ault:
R
ename 't
r
ac
k
ing' to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
Provide 'git
m
er
g
e --a
b
ort' as a
s
y
n
onym to 'git rese
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
a
n
d
cmd_merge(): Parse
op
t
ion
s
b
efore checking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Pro
v
ide
'
git notes get
-
ref' to easily retrieve curren
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
lan
d
gi
t
notes merge
:
A
dd
t
e
stcases f
o
r
m
e
rging note
s
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git note
s
merge: Add ano
t
her auto-re
s
olving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Her
l
and
gi
t
notes merge: --c
o
m
m
it should fai
l
if unde
r
lying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
n
d
g
i
t note
s
merge: L
i
st
con
f
l
i
cting
n
otes in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n Herl
a
n
d
git not
e
s
mer
g
e: Ma
n
ual confl
i
ct
r
esolutio
n
,
part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herl
a
n
d
g
i
t notes merge: Manual
conf
l
ict resol
u
tion, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
land
Do
c
ument
a
tion: Preliminary
d
oc
s
on 'git
n
otes
merge
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it
n
ot
e
s merge: Add automatic conflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
H
e
rland
g
i
t note
s
merge: Handle real, non-conflict
i
ng notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bui
l
ti
n
/notes
.
c
:
Refactor cre
a
t
ion of notes
commit
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git
notes merge:
Ini
t
i
a
l
im
p
lementation handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
builtin/not
e
s
.
c: Split not
e
s
r
ef DW
I
Mmery into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use two newlines (instead o
f
one) when c
o
nca
t
enatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
(trivial) t3303: Indent with tabs in
s
tead of spac
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
notes
.
h/c:
P
ropa
g
a
te combine_notes_fn return val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Her
l
an
d
notes
.
h/c: Allow c
o
m
b
ine_notes function
s
t
o
remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c
:
Reorder func
t
ions
i
n pr
e
para
t
ion for
n
e
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
not
e
s
.
h: Make default
_
note
s
_r
e
f
(
)
availabl
e
in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) notes
.
h
: Minor documentat
i
on fix
e
s to copy_not
e
s(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
t
e
s
.
c: Hexify SHA
1
in die(
)
message from in
i
t_not
e
s()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
oh
a
n Herland
note
s
: Don't cre
a
te (empt
y
) commit when remo
v
ing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable cu
s
t
o
m schemes for column colors in
the
graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an
Her
l
and
Make gr
a
p
h
_nex
t
_
line() a
v
ailable
i
n the gra
p
h
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
e
r
land
revision: Turn o
f
f
history simplifi
c
a
t
ion i
n
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
rev
i
sio
n
: Fix
t
ypo in --ance
s
try-path err
o
r
m
ess
a
ge
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docu
m
entation/rev-list-o
p
tio
n
s
.
txt: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/rev-l
i
st
-
option
s
.
txt:
F
ix
missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan H
e
rland
d
iff
.
c: Ensu
r
e "index $
f
r
om
.
.
$t
o
" line contain
s
u
nam
b
iguou
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan H
e
r
l
and
builtin-notes: Minor (
m
ostly parse_options-r
e
lated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
Herland
su
b
module summar
y
: D
o
n't barf when i
n
vo
k
ed in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
bu
i
ltin-n
o
tes: Add "copy" subco
m
mand for copyin
g
no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-notes: Misc
.
refactoring
o
f argc and exit valu
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herland
b
u
ilt
i
n-notes:
Ad
d
-
c
/-C
o
p
tions for
r
eusi
n
g notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-no
t
es: Refactor handling of -F op
t
ion to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
builtin-
n
otes: Depr
e
cate the -m/
-
F
o
ptions for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin
-
notes: A
d
d "a
p
pend" subcomman
d
fo
r
app
e
nding
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes: A
d
d
"a
d
d
"
subco
m
m
a
nd for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes
:
Add --message/-
-
file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an
H
erland
b
uiltin-
n
ote
s
: Add "list
"
subcommand
for listing n
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erla
n
d
Docum
e
n
t
a
tion:
Generalize git-no
t
e
s
d
o
cs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes: Add "prune"
s
ubcommand for r
e
moving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herland
Notes
A
PI
:
p
r
u
n
e_notes(): Pr
u
n
e n
o
t
es that belo
n
g to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3
305: Ver
i
fy th
a
t removi
n
g n
o
tes triggers automat
i
c
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-n
o
t
e
s: Add "remove" subcom
m
a
n
d
for r
e
moving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
Teach bu
i
ltin-notes to remove empt
y
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
land
Tea
c
h
notes code to properly preserve
no
n
-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
l
a
nd
t
3
305: Verify
th
a
t add
i
ng ma
n
y notes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
t3
3
01: Verify success
f
ul anno
t
atio
n
of non-commi
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Builtin-ify
g
i
t-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
R
efactor n
o
tes
concatenation into a
f
lexible inte
r
fac
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Her
l
and
Notes AP
I
: Allow multiple co
n
curre
n
t note
s
trees
w
ith
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes API: write_notes_tree(
)
:
Store the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
H
erla
n
d
Not
e
s API: fo
r
_each_note(): Traverse the entire
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
Note
s
API: get_not
e
(
)
: Return the
note annotati
n
g the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes A
P
I: remove_note()
:
Remove
n
ote objec
t
s from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Notes API: add_not
e
(): A
d
d note
o
b
jects to
t
he i
n
te
r
nal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
No
t
es
API: init_
n
otes(
)
:
In
i
ti
a
lize the notes tre
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herlan
d
A
dd tests for check
i
ng correct handli
n
g
o
f $GIT_NOTES_
R
E
F
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
N
o
t
es API: get_comm
i
t_no
t
es() -> f
o
rm
a
t_note() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Minor cosmetic fixes to
notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Jo
h
an Herland
builtin-config: Fix crash when
using "-
f
<rel
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herlan
d
Add
more testcases to t
e
st fast-import of note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan H
e
rland
R
ename t9
3
01 to t9350,
t
o make roo
m
for
mo
r
e fast-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan
H
erland
fast-import: Pr
o
per notes tree manipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
J
o
h
an Herla
n
d
Fix c
r
asher on enc
o
un
t
ering SHA1-like n
o
n-
n
ot
e
in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Joha
n
Herland
Basic build
i
nf
r
astructure
f
or
P
ython sc
r
ipts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herla
n
d
Ad
d
s
elftests veri
f
ying
con
c
ate
n
ation of multiple
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
R
e
f
actor notes cod
e
to co
n
catena
t
e mult
i
ple notes
a
nnotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
and
A
dd selftests verifying that we ca
n
parse notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
T
e
a
c
h t
h
e notes lookup code to
p
a
rse notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han H
e
rland
Tea
c
h not
e
s co
d
e
t
o
free its
i
nternal data structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
an
H
e
rland
Add flags to get
_
commit
_
n
o
tes() to control t
h
e format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
t3302-notes-index-expensive: Speed up
create_rep
o
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next