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
Merge branch 'jk/diff-algo'
2013-09-24
Johan Herlan
d
sample pre-comm
i
t
h
o
o
k: use --bool w
h
e
n
retrievin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Her
l
and
t3200: Add test demonstrating min
o
r reg
r
ession
i
n 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n H
e
rland
Refer to
branch
.
<
name>
.
remot
e
/me
r
ge when
docu
m
enting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t3200: Minor fix
w
he
n
preparing
for trac
k
ing failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han Herland
t2
0
24: Fix &&-chain
i
ng a
n
d a coup
l
e
o
f
typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
M
o
v
e
create_not
e
s_co
m
mit()
f
ro
m
notes-
m
erge
.
c i
n
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
o
han
H
erland
Move copy_note_for_rewrite
+ f
r
iends from builtin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
o
han Herl
a
nd
f
inish_c
o
p
y
_
notes_for_rewrite(): Let caller prov
i
de
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
gl
o
ssary: Updat
e
and rephrase the definition
o
f a rem
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branc
h
.
c: Validate
tracking branches
with
refs
p
ec
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n
H
erland
t911
4
.
2: Don't use
-
-track op
t
ion
a
gai
n
st
"svn-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
rland
t720
1
.
24: Add refs
p
ec to k
e
e
p
--track workin
g
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
3
200
.
3
9
:
trackin
g
setup should
f
a
il if there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
checkout: Use rem
o
te refspecs when
D
WIMm
i
ng trackin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
t2024: Show
failure to
u
se ref
s
pec when D
W
IMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
t2024: Add tests
v
e
ri
f
ying c
u
rrent
D
W
I
M behavio
r
of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herla
n
d
gi
t
s
y
mbolic-ref --del
e
te
$
s
ymref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
Herland
Fix failur
e
t
o
delete a packed ref through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan H
e
rland
t1400-update-ref: Add
t
est verifying
bug wit
h
s
y
m
r
e
f
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes
-
merge:
D
o
n't rem
o
ve
.
git/NOTE
S
_MERGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
r
l
an
d
notes-merge: use
opendir
/
read
d
ir 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
t
o "n
o
tes merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
r
land
fast
-
import:
Fi
x
incorrect fanout level when mo
d
ifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herlan
d
t9301: Add 2nd testcase exposing bu
g
s in fast-i
m
port
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
e
rland
t9301: Fix
t
e
stcase covering up a bug
i
n fast-i
m
port
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
a
n Herl
a
nd
t
5
400
:
Fix a couple of
t
ypos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Mark di
r
stat
error messages fo
r
t
r
an
s
lation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Improve error handl
i
n
g when pa
r
sing dirstat pa
r
ameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
New --di
r
s
t
at=lines mode, do
i
n
g dirstat analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Allo
w
s
p
ec
i
fy
i
ng -
-
dirstat cut-off
percentage as
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add config va
r
iable
f
o
r
spec
i
fy
i
ng default --d
i
rstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
H
erla
n
d
Ref
a
ctor --dirstat pars
i
n
g
; depreca
t
e
--c
u
mulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Make -
-
dirs
t
at=0 output directories that c
o
ntri
b
ut
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
d
d seve
r
al testcases for --dirstat
an
d
friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat
:
In
c
ase of renames
,
use
target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan He
r
land
Teach
--dirstat not to comple
t
ely
ignore rearra
n
ge
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herlan
d
--dirstat-by-file: Make
i
t fas
t
er and
m
ore corr
e
ct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herland
--
d
irstat: Describe non-
o
bvious differenc
e
s relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
Make "git not
e
s a
d
d"
mor
e
use
r
-frie
n
dly when
ther
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan Herlan
d
log
/
pretty-op
t
ions
:
Do
c
ument
-
-
[
n
o-]no
t
e
s
and
d
eprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan H
e
rland
branch/c
h
eckout --track: Ensur
e
that
upstream
branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herl
a
nd
push
.
default: R
e
n
a
me 'tracking'
t
o
'upstream
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
e
rland
Provide 'git mer
g
e --abort' as
a sy
n
onym to '
g
it re
s
et
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
Herland
c
md_mer
g
e(): Par
s
e options before checking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
P
rovide
'
git notes get-r
e
f' to e
a
sily retrieve cu
r
r
e
nt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git
notes merge: Add tes
t
cases for merging n
o
tes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git
notes merge: Add anot
h
er auto-resolvi
n
g stra
t
egy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
g
i
t
notes merge: --commit should
fa
i
l if u
n
derlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herland
gi
t
notes merge: List
c
onflicti
n
g
notes in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
g
it note
s
merge: Man
u
al conflict resolution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git
n
otes
m
e
r
g
e
: Ma
n
u
a
l confl
i
ct
r
esolution,
p
art 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Doc
u
ment
a
t
ion
:
Preli
m
ina
r
y docs on 'git not
e
s merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merge: A
d
d a
u
tom
a
tic
conflic
t
re
s
olvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
merge: Handl
e
real
,
non
-
conflict
i
ng n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
builtin/notes
.
c
: Ref
a
ctor
crea
t
ion of note
s
comm
i
ts
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herla
n
d
git notes merge
:
Init
i
al implementation handling tr
i
via
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/n
o
te
s
.
c
: Split
not
e
s ref
DWIMmery
i
nto a
s
eparate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use two newline
s
(inste
a
d
o
f one) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
(trivia
l
) t3303: In
d
ent
w
ith
tabs instead of
s
pa
c
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
notes
.
h/c: Propaga
t
e combine_n
o
tes
_
fn retur
n
va
l
ue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
notes
.
h/c
:
Allow combine_note
s
functions
t
o remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c
:
Reorder
f
u
nctions in preparatio
n
for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Make default_note
s
_re
f
() available
in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
(tr
i
vial)
n
otes
.
h: M
i
n
o
r documentation fixes to copy_
n
o
tes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herlan
d
notes
.
c: Hexif
y
SHA1 i
n
die
(
)
message from
i
n
i
t_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
o
han Herland
n
o
tes: Don't crea
t
e (empty) c
o
mmit when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable custo
m
scheme
s
for column
colors i
n
the gr
a
ph A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Mak
e
graph_next_li
n
e() available in the g
r
aph
.
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
revision: Turn off
hi
s
tor
y
simplifi
c
at
i
on i
n
-
-ancest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
r
e
v
ision: Fix typo in --ance
s
t
r
y-
p
at
h
e
r
ror message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan
H
erland
Documentation/re
v
-
lis
t
-options
.
txt: Expl
a
in --an
c
estry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n
Herland
D
ocumen
t
at
i
on/rev-lis
t
-op
t
ions
.
t
xt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c
:
E
nsur
e
"index $fro
m
.
.
$to" line c
o
ntai
n
s unambiguou
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
ohan Herland
builtin-no
t
es: Minor (most
l
y
p
arse_o
p
t
i
o
ns-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
o
h
an He
r
la
n
d
subm
o
dule summary
:
Don't
b
arf wh
e
n invoked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-
n
otes: Add "copy" subcomm
a
nd
f
or copying
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
b
u
iltin-n
o
t
e
s
:
M
isc
.
refac
t
or
i
ng of argc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
i
ltin-note
s
: Add -c/-C opt
i
ons 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
o
r
ha
n
d
l
ing of -F
o
p
tion to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
land
builti
n
-
notes: Deprec
a
t
e the -
m
/
-F options f
o
r "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-note
s
: Add "a
p
pend"
s
ubco
m
mand fo
r
append
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
i
l
tin-notes: Add
"add" s
u
bcomman
d
for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
and
b
uilt
i
n-not
e
s
: Add
--m
e
ssage/--f
i
le aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builti
n
-notes: Add
"list" subcommand for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
D
o
c
umen
t
ation
:
Ge
n
eralize
git-
n
otes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
bui
l
ti
n
-notes: Ad
d
"prune"
s
ubcommand
f
or removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
Notes API: prun
e
_notes(): Prune notes th
a
t belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
05: V
e
rify
that rem
o
v
i
ng notes triggers autom
a
tic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-notes: Add "r
e
move" su
b
command for remov
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
Teach
builtin-notes
t
o remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach notes code
to properly preserve non-n
o
t
es in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
t
3
3
0
5: Verify
that addi
n
g ma
n
y not
e
s with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
t3301: Ver
i
fy successful annota
t
ion of
n
on-commit
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herla
n
d
Builtin-
i
fy g
i
t-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Refactor notes conc
a
tenation into
a flexi
b
le interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes API: Allow multip
l
e conc
u
rrent notes trees
w
i
th
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
Not
e
s
A
P
I: write_
n
otes_tree():
S
t
ore the note
s
t
r
ee
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herlan
d
Notes API: for_each_not
e
()
:
T
r
averse
the entire note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
la
n
d
Notes API:
get_note(): Retu
r
n
t
h
e no
t
e annotat
i
ng the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
N
otes API: remove_note(
)
: Remo
v
e note objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next