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
t3030-merge-recursive: test known breakage with empty work tree
2013-09-09
Joh
a
n Her
l
and
t3
2
00
:
Add test demonstrating minor
r
e
g
ressio
n
in 41c
2
1f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
h
a
n
He
r
land
Refer t
o
branc
h
.
<
n
ame>
.
remote/merg
e
w
h
en
documenti
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t3200: Minor fix when pr
e
paring for tracking failur
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan H
e
rlan
d
t20
2
4: Fix &&-chaining a
n
d a co
u
ple o
f
typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Her
l
and
M
ove create_notes_com
m
it() from no
t
es-merge
.
c i
n
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move copy_note_for_
r
ew
r
ite + friends from builtin/no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
f
i
nis
h
_co
p
y_n
o
tes
_
fo
r
_rewrit
e
(
):
L
et c
a
ller provi
d
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
g
lossary:
U
pdate and r
e
phrase the d
e
finit
i
on
o
f a remo
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c: Validat
e
t
r
acking b
r
a
n
c
h
es wi
t
h refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
911
4
.
2: Don
'
t use --track
option again
s
t
"svn-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
land
t7201
.
24: Add re
f
spe
c
t
o keep
-
-
t
r
ack wo
r
k
i
n
g
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
l
a
nd
t3200
.
39: tracking setup should f
a
il if there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
c
h
eckout: Use remote
r
efspecs when DWIMming
t
rackin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024: Show fai
l
u
r
e to use refspec
when DWIMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024:
A
dd
tes
t
s verifying c
u
rrent D
W
IM behavi
o
r of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an Herland
g
i
t symbolic-
r
ef -
-
delete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan Her
l
a
n
d
Fix
f
ailu
r
e to
del
e
te a packed ref throug
h
a
s
ymref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan H
e
rl
a
nd
t1400-update-ref: Add test verifying bug with symre
f
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han He
r
land
notes-m
e
rge: Don't
r
emove
.
gi
t
/N
O
TES_MERGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-mer
g
e: use
o
pendir/rea
d
dir instead of using 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
han Herla
n
d
t3310: illustrate failure to "notes merge
--commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an
H
e
rl
a
nd
fa
s
t-import: Fix
i
n
correct
f
anout level when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rla
n
d
t9301: A
d
d 2nd test
c
ase exposi
n
g bugs in
f
ast-impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han
H
erland
t9301: Fix testcase
c
o
v
ering up a
b
u
g
in fast
-
impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix a couple o
f
typo
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herl
a
n
d
Mark d
i
rs
t
at error messages for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herla
n
d
I
m
prove e
r
ror handl
i
n
g
when
p
ar
s
in
g
dirstat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
N
ew --dirstat=l
i
nes mode, doi
n
g dirstat analys
i
s
based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow spe
c
i
fying --dirsta
t
cut-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add
c
onfig var
i
able for
s
pecifyin
g
d
ef
a
u
l
t -
-
dir
s
t
at
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Refactor -
-
dirstat parsing;
d
eprecate --
c
u
mu
l
at
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
l
and
Make --dirstat=0
o
utput direct
o
ries
t
h
a
t contribut
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Add several test
c
ases for --
d
irsta
t
and frien
d
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
ohan Herla
n
d
--dirsta
t
: In case of renames, use targ
e
t filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rland
Teach
--dirs
t
at not to completely ignore
r
e
arra
n
ged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Her
l
a
n
d
--
d
irstat-by-file: Make i
t
fast
e
r
and more c
o
rrect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: Describe non-obv
i
ou
s
difference
s
relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "gi
t
notes add"
more us
e
r
-
f
r
i
e
ndly whe
n
the
r
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/pretty
-
o
ptions: Do
c
ument
--[no-]not
e
s and deprec
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Jo
h
a
n
H
erlan
d
branch/checkout --track: Ensure th
a
t upstream b
r
a
nch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan H
e
rla
n
d
push
.
default: R
e
name
't
r
a
c
king' t
o
'ups
t
ream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
Pr
o
v
ide 'git merge --abort' as a syno
n
ym to
'git
r
eset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
c
md
_
merge()
:
P
a
rse opti
o
ns before checkin
g
M
ERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
Prov
i
de
'git n
o
tes get-ref
'
to ea
s
ily
r
etrieve
c
ur
r
ent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes
merg
e
: Add
testcases for mergin
g
notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
g
it notes mer
g
e
:
Add another auto-resol
v
i
n
g strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t no
t
es merge: --com
m
it shoul
d
fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n Herland
git notes merge: List conf
l
icting notes in
notes me
r
g
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git n
o
tes
merge: Man
u
al conflict
resolu
t
ion, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Manu
a
l
conflict
re
s
olution, par
t
1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
D
o
c
u
ment
a
tion: Prelimina
r
y
d
o
c
s on 'git note
s
merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git no
t
es
merge: Add automa
t
ic conflict
r
esolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
gi
t
notes merge:
H
andle
r
eal, non-c
o
nflicting
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
builtin/notes
.
c
:
Refactor cre
a
tion
o
f notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
erge
:
Initial implementat
i
on handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c: Split notes ref
DWI
M
mery into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
r
land
notes
.
c:
U
se t
w
o newl
i
n
es (in
s
tead of one) when
c
o
n
c
atenati
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
land
(
t
r
i
v
ial) t3303: Indent with tabs instead
o
f spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
rland
notes
.
h/c: Propag
a
t
e
combi
n
e
_
notes_fn
r
eturn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herla
n
d
note
s
.
h/
c
: A
l
l
o
w c
o
mbine_notes func
t
i
ons to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han
Her
l
and
notes
.
c: Reo
r
der functions in preparation for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
notes
.
h: Make d
e
fault_not
e
s_re
f
() available in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(tr
i
vial) notes
.
h: Min
o
r
d
ocumentation
f
ixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
oh
a
n
Herland
notes
.
c: Hexify SHA1 in die() m
e
s
s
age from init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joha
n
Herland
not
e
s: Don't cr
e
ate (empty)
commit
w
he
n
r
emoving no
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
ha
n
Herland
En
a
ble custom
s
ch
e
mes fo
r
c
o
lumn colors in the gra
p
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herlan
d
Make
g
rap
h
_next_line() available in t
h
e graph
.
h
A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
re
v
isio
n
: Turn
off his
t
ory simplif
i
cati
o
n i
n
--ances
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
revision: Fi
x
typo in --ancestry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
land
Docu
m
en
t
a
tion
/
rev
-
list-options
.
t
x
t:
E
xplain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
Do
c
ume
n
tation
/
rev
-
lis
t
-optio
n
s
.
txt: Fix missing l
i
ne
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Joha
n
Herland
diff
.
c: Ensure "index $from
.
.
$to" line
c
ontains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herl
a
nd
builtin-
n
ote
s
:
M
i
nor (mostly
p
arse_options
-
re
l
at
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herla
n
d
su
b
mod
u
le s
u
mmary: Don't barf when invo
k
e
d
in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes: Add "copy" subcommand for copying note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
b
u
iltin-notes
:
Misc
.
refact
o
ring
o
f
a
rgc and exit
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
buil
t
in-n
o
tes: Add -
c
/-C options for reusi
n
g n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
b
uiltin
-
notes: R
e
fact
o
r handl
i
n
g
of -F
o
ptio
n
to
allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
b
uilti
n
-notes: D
e
prec
a
te the -m/
-
F options for
"
g
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-n
o
tes: Add
"append" subcommand
f
or appe
n
d
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Add "add" subc
o
mmand
for
adding n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes:
Add --message/--file alia
s
es for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-notes: Add "list" s
u
bcommand for list
i
ng note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herla
n
d
Documentation:
G
eneralize gi
t
-notes d
o
c
s to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herland
builtin-notes: Add
"
prune" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI
:
p
r
une_notes
(
): Pru
n
e not
e
s that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herland
t3
3
0
5: Verify t
h
a
t
removing note
s
trig
g
ers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
bui
l
tin-n
o
t
es: Add "
r
emove" subcom
m
and for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Teach b
u
iltin-notes to
r
emo
v
e
e
m
p
t
y n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Teach not
e
s code to pr
o
perly p
r
eserve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
t3305: Ve
r
ify tha
t
ad
d
i
ng
m
an
y
note
s
with
g
it-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
t3301:
Verif
y
successful annotation
o
f
non-
c
ommits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
B
u
ilt
i
n-
i
fy git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refactor notes
c
o
n
catenation into
a
flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes API: Allow multip
l
e con
c
urrent
n
o
tes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Notes A
P
I: write_notes_tree()
:
Stor
e
the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s
A
PI: f
o
r_each_note(): Tra
v
erse th
e
e
n
t
i
r
e
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes API
:
get_no
t
e():
R
eturn the
n
ote annotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
Notes API: remove_note(
)
: Remove note o
b
jects f
r
om
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s A
P
I: add_
n
ote(
)
:
A
dd
note objects to the int
e
rnal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next