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 'mm/rebase-continue-freebsd-WB'
2013-09-09
Johan Herland
t3200: Add test demonstrati
n
g m
i
no
r
regression in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
Herland
Refer to b
r
a
nch
.
<
n
ame
>
.
remo
t
e
/
merge when documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herl
a
nd
t3200: Mino
r
fix
when preparing for tracking failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan He
r
land
t2024
:
Fi
x
&&-chaining and a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move
c
reate_no
t
es
_
commit() from
n
ot
e
s-merge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
o
h
a
n Herlan
d
Move copy_n
o
te_for_rewr
i
te + friends from builtin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herla
n
d
fin
i
sh_cop
y
_notes_for_r
e
write
(
): Le
t
caller provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
gl
o
ssar
y
:
U
pdat
e
and
r
eph
r
as
e
the definit
i
on of a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
b
r
anch
.
c
: Validate tracking branches with
r
efspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
t9114
.
2:
D
o
n't
u
se --
t
rack
o
ption against "
s
vn-r
e
mot
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
72
0
1
.
24: Add refspe
c
to keep
-
-track
w
orking
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
3200
.
39
:
trackin
g
se
t
up should fa
i
l if there is n
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herl
a
nd
c
h
eckout: Use rem
o
te ref
s
pecs when DW
I
Mming tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
2
024: S
h
o
w
failure to use refspec
when DWIMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
h
a
n Herl
a
nd
t
2
0
2
4
: Add
t
ests
v
er
i
fyi
n
g
current DWIM behavi
o
r of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
erl
a
nd
git symbo
l
ic-ref --
d
elete
$
s
ymref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herlan
d
F
i
x failur
e
to
de
l
ete a packe
d
r
e
f th
r
ough a symre
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herlan
d
t1400-update-ref:
Add test
ve
r
i
f
ying bug wi
t
h
s
ymref
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan He
r
l
a
nd
no
t
e
s-merge: Don't
r
emove
.
git/N
O
TES_MERGE_WO
R
KTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herla
n
d
notes-merge: use opend
i
r/readdir instead
of using r
e
ad_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
and
t3310: ill
u
strate failure
t
o "no
t
es merge --com
m
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herla
n
d
fast-impor
t
:
F
i
x incorrec
t
fanout level when m
o
difying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herland
t
9
301: Add 2nd testcase exp
o
sing bugs in fa
s
t-impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t
9
301: Fix testcase cover
i
ng
u
p
a bug in fas
t
-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t
5
400
:
F
i
x
a
couple of ty
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark
d
irstat error message
s
for t
r
ansl
a
tion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
I
m
prove error
h
an
d
ling
w
h
e
n pars
i
ng
di
r
sta
t
p
a
rameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
N
e
w --dirst
a
t=li
n
es mode, doing dirstat analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan H
e
rl
a
n
d
Allow specifyin
g
-
-
dirstat
cut-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
A
d
d config variable for specifying default --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Refactor
-
-dirstat parsing; de
p
recate --cu
m
u
l
ati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Mak
e
-
-
dirst
a
t
=
0 output di
r
ectories
that contribut
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herla
n
d
A
d
d several testcase
s
f
o
r
--di
r
stat
and
frie
n
ds
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
o
han Her
l
and
--dirst
a
t:
In case
of renames, use t
a
r
get f
i
lename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rl
a
n
d
Teach --d
i
rstat
n
ot to complete
l
y
ignor
e
rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-
dirstat-by-
f
ile: Make it faster and
m
ore correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-di
r
s
tat: Desc
r
i
be
n
o
n
-obvi
o
us differen
c
es rel
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Her
l
and
M
a
ke "gi
t
notes add" more user-friend
l
y when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
an Herland
log/pretty-options: Documen
t
--[no-
]
notes a
n
d dep
r
ecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herlan
d
branch/ch
e
ckout --track: Ensure
t
hat upstre
a
m b
r
anch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
pus
h
.
d
e
faul
t
: Rename 'tracki
n
g' to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
P
r
ovid
e
'gi
t
mer
g
e --
a
bo
r
t' as a syno
n
y
m
to 'g
i
t re
s
et
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
cmd_merge(): Pa
r
se options before checki
n
g M
E
RGE_
H
EAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
e
rlan
d
Provide 'git notes get-ref'
t
o ea
s
ily re
t
rieve cur
r
ent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git note
s
mer
g
e: A
d
d testc
a
ses
f
o
r
m
e
rging n
o
tes
t
r
e
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge
:
A
d
d another auto-re
s
olving stra
t
egy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
tes merge: --
c
om
m
it should fail if u
n
d
e
r
l
y
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
g
i
t
notes mer
g
e: List conflic
t
ing notes in notes
m
erg
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes mer
g
e
:
Manual
con
f
lict resolution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
land
git notes
merge:
Manual
c
onflict resolution, par
t
1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documenta
t
ion: Preliminary docs on 'git notes mer
g
e'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
g
i
t
n
ot
e
s merge: Add automatic
c
o
nflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
g
it notes merge: Handle real, non-confli
c
ti
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
builtin/notes
.
c: Refacto
r
crea
t
ion of
notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
g
it no
t
e
s
merge: Initial im
p
le
m
entation ha
n
dli
n
g trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
b
ui
l
tin/notes
.
c: Split notes r
e
f DWIMmery in
t
o a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
no
t
es
.
c: Use two newlines
(inste
a
d of one)
w
hen
con
c
atena
t
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
(trivial) t3303: Indent
with tabs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
notes
.
h
/c: Propagate combine
_
notes_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
h/
c
: Allow combine_notes func
t
ions
to
rem
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
no
t
e
s
.
c: Reorder functi
o
ns in preparat
i
on
for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
note
s
.
h: Make default_note
s
_ref() available in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
(trivial) notes
.
h: Min
o
r
d
ocumentation fixes
to co
p
y_n
o
tes(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Her
l
and
notes
.
c: Hexify SHA
1
i
n
di
e
() message from i
n
it_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Her
l
and
no
t
es: Don'
t
c
reate (empty) commit when r
e
m
o
ving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
h
an Herl
a
nd
Enable custom schemes f
o
r column col
o
rs in the
graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
erl
a
nd
Mak
e
g
raph_next_line()
ava
i
labl
e
in
the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
revi
s
ion: Tur
n
off histo
r
y si
m
plif
i
cation in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rl
a
n
d
revision:
Fix
typo
in --anc
e
str
y
-pa
t
h erro
r
messag
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
D
o
cumentation/
r
ev-lis
t
-option
s
.
txt: Explain --ancestr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
l
and
D
o
c
umentation/rev-list
-
options
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
d
i
ff
.
c: Ensure "index $from
.
.
$to" line co
n
tains unambi
g
uous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herl
a
nd
builtin-n
o
tes: Minor (mostly parse_option
s
-re
l
ated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan He
r
land
submodule summary:
D
on't barf w
h
en
invok
e
d in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes: Add "copy" s
u
b
command fo
r
co
p
ying
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
bu
i
ltin
-
notes: Mi
s
c
.
refac
t
oring
of
a
rgc and
e
xit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Add -c
/
-C
options for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes: Refactor handli
n
g of -F option
to
allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herlan
d
bui
l
tin-
n
o
t
es:
D
eprecate the -m/-F options fo
r
"g
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-no
t
es: Add
"
append" subco
m
man
d
for
ap
p
ending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: A
d
d "a
d
d" subcomm
a
nd for
adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herlan
d
builtin-
n
o
tes
:
Add --message/--file aliases
for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-n
o
tes:
A
d
d
"list" subcommand for lis
t
in
g
note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
n
d
Docume
n
tation: Gene
r
alize git-notes docs to '
o
bjects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
builtin-notes
:
Ad
d
"prune" sub
c
ommand
f
o
r
rem
o
vin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API: prune_
n
otes(): Prune notes that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
t3
3
05: V
e
r
ify tha
t
removing n
o
tes
trigge
r
s automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-notes:
A
dd
"
rem
o
ve"
subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
l
an
d
Tea
c
h bu
i
ltin-notes
t
o
rem
o
ve empty
n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
Tea
c
h notes code to prope
r
ly
p
reserve
non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
t3305: Verify t
h
at addi
n
g many notes with
g
it-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
t3301: Verify su
c
c
e
s
s
ful annotation of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Builtin-ify git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
R
e
factor
n
otes concatenation i
n
to a
f
lexibl
e
i
n
terfac
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
Notes A
P
I: A
l
l
o
w multiple concurrent notes trees wi
t
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herland
N
o
t
es API: w
r
ite_notes_tr
e
e(): Sto
r
e the notes
t
r
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: for
_
each_not
e
()
:
Traverse the
entire not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API
:
ge
t
_note
(
): Return the not
e
annota
t
in
g
the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Her
l
and
Notes API: remove_
n
ote(): Re
m
ov
e
no
t
e objec
t
s
f
rom
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
N
otes
API: add_note():
A
dd note object
s
to the internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next