repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t2024: Fix &&-chaining and a couple of typos
2013-09-09
Joh
a
n Herlan
d
t202
4
:
F
ix &&-c
h
a
i
ning and a couple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an
H
erland
g
lossary: Update and rephra
s
e
t
h
e definit
i
o
n of a
r
e
m
ote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herlan
d
branch
.
c:
V
alidate
t
racking branches with refspe
c
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herland
t9114
.
2: Don't use --trac
k
option against "svn
-
remot
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
nd
t7201
.
24:
Add refs
p
ec to keep --
t
r
a
c
k wo
r
king
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herl
a
nd
t3200
.
3
9
: tracking setup should fail if there is
n
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
c
h
eckout: Use remote
r
e
f
s
pecs when DWI
M
m
i
ng
tracking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Her
l
a
nd
t2024: Show failur
e
to use refspec when DWIMming rem
o
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
nd
t2
0
24: Add te
s
ts v
e
rifying curren
t
DWIM
b
ehavi
o
r o
f
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n Herland
git
symbolic-
r
ef --delete $symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
a
n
Her
l
and
Fix failure to delete
a
pack
e
d ref through a
sym
r
ef
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
H
erl
a
nd
t1400-update
-
ref: Add tes
t
v
erifyin
g
bug with s
y
mr
e
fs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan
Her
l
and
note
s
-m
e
rg
e
: Don't r
e
m
o
ve
.
git/NOTES_MERGE_WORKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan He
r
land
n
o
tes-merge: use open
d
ir/
r
eaddir 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
Johan He
r
land
t
3
3
10: illustrate
f
ailure to "notes merge
--commit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an Herland
f
a
st-i
m
p
ort: Fix inc
o
rrect
f
an
o
ut
level
wh
e
n
mo
d
if
y
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
r
l
and
t9301: Add
2nd testca
s
e expos
i
ng
b
ugs in fast-
i
mport
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an
Herland
t9301: Fix testcas
e
covering up a bug in fast
-
import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan
H
e
r
l
and
t5400
:
Fix
a c
o
uple of
t
ypos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mar
k
dirstat error messa
g
es for translation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Imp
r
ove
error hand
l
in
g
when parsing dirstat
param
e
ters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
New
--
d
irstat=line
s
mode, doing
d
ir
s
tat analys
i
s
b
a
s
e
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Allow specifying --
d
irs
t
at cut-off per
c
ent
a
ge as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Ad
d
con
f
ig var
i
able for specif
y
i
n
g
def
a
ult --dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
R
e
factor --d
i
rstat parsing; de
p
recate --cumulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herl
a
n
d
Make --dirstat
=
0 outp
u
t di
r
ector
i
es that contribu
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Add s
e
veral testcases for --
d
i
r
sta
t
and friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat: In ca
s
e of renames
,
use target
filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
a
nd
T
each --di
r
stat
n
ot to complete
l
y ig
n
ore rear
r
ange
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rland
--dirstat-by-fi
l
e:
Ma
k
e it faster a
n
d
m
ore correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herla
n
d
--dirst
a
t
: Describe
non-obvi
o
us di
f
feren
c
es r
e
lative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan
H
e
r
land
Ma
k
e
"
git
notes
add" more user-friendly w
h
en there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
log/pretty-options
:
Document --[no-]notes and deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan He
r
l
and
branch
/
check
o
ut --track: Ensure that
upstrea
m
bran
c
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan He
r
land
push
.
default: Rename 'tracki
n
g' to 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
Provide 'git merge --abort' as a synonym to 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
cmd_mer
g
e(): Parse op
t
ions be
f
ore
c
h
e
c
ki
n
g
M
ERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
Prov
i
d
e
'git notes get
-
ref' to easily retrie
v
e current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git
notes merge: Add t
e
s
t
cases
f
o
r merging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
gi
t
notes merge:
A
d
d
another auto-resolvi
n
g strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes merge
:
-
-
c
ommi
t
shoul
d
fail if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: List c
o
nflict
i
ng notes in notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes me
r
g
e: Manual conflict
r
eso
l
ution, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n H
e
r
land
g
i
t notes merge:
Manua
l
confli
c
t resol
u
tion, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documen
t
at
i
on: Prel
i
minary docs on 'git notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
es merg
e
: Add automatic conflict resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an He
r
l
and
git notes merge: H
a
ndle re
a
l,
n
on-conflicting notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
r
l
and
built
i
n/notes
.
c: Refactor creati
o
n
o
f notes commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herl
a
n
d
git notes merge: Initial i
m
plemen
t
ation
h
a
ndling triv
i
al
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
builtin/notes
.
c: S
p
lit notes ref
D
WIMmer
y
i
nto a s
e
par
a
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Her
l
a
nd
n
otes
.
c: Use
t
wo
new
l
ines (instead of one) when concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
(trivial)
t
33
0
3:
Ind
e
nt with
t
abs in
s
te
a
d of spac
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
note
s
.
h
/c: Pro
p
agate combine_notes_fn return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
notes
.
h/c: Allow combine_n
o
t
es functions to re
m
o
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
Herland
notes
.
c: Reor
d
er fu
n
ctions in
pr
e
pa
r
a
ti
o
n
f
o
r
next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
no
t
es
.
h: Mak
e
d
ef
a
ult_notes_ref()
a
vailable i
n
notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) not
e
s
.
h: Min
o
r
d
ocu
m
entation
f
ixes to cop
y
_note
s
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
note
s
.
c: Hexify SHA1 in die() messag
e
from
i
nit_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
J
ohan Herland
notes:
D
on't create (em
p
ty) commit
when
r
e
m
oving no
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
E
n
abl
e
cust
o
m s
c
hem
e
s for co
l
umn c
o
l
o
rs in the g
r
aph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han Herl
a
n
d
Make gr
a
ph_next_line() a
v
ailable
i
n
t
he gra
p
h
.
h AP
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
r
evisio
n
: Turn off hist
o
ry simplification in
-
-ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revis
i
o
n
: F
i
x typo
i
n --ancestry-
p
ath error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
D
ocumentat
i
on/rev-
l
ist-opt
i
ons
.
txt:
E
xpla
i
n --ances
t
ry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentat
i
on/rev-list-opti
o
ns
.
txt: Fix mi
s
sing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
J
o
ha
n
Herland
di
f
f
.
c
: En
s
ure "index $from
.
.
$t
o
"
line con
t
ains unamb
i
guo
u
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan He
r
land
builtin-notes: Minor
(mostly pars
e
_options
-
related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Joha
n
H
erland
submodule sum
m
ar
y
:
Don
'
t barf wh
e
n
invok
e
d in
an e
m
pt
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
b
u
iltin-
n
o
t
es: Add "cop
y
" subcomma
n
d fo
r
copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
a
n
d
builtin-notes: Misc
.
refactoring of arg
c
and exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Her
l
and
buil
t
in-notes: Add -c/-C options
for reusing notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
builtin-
n
otes: Refactor handling of -F opti
o
n
to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-
n
otes: Deprecate t
h
e -m
/
-F options
f
o
r "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
bui
l
t
in
-
notes: Add "appe
n
d" subcommand for
a
ppend
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
b
uiltin-no
t
es: Add "add" subcomman
d
for adding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes: Add --mes
s
age/--file aliases
f
or -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-notes: Add "
l
i
st" sub
c
ommand for li
s
ting no
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herlan
d
Documentatio
n
: Ge
n
e
r
alize git-notes
d
oc
s
to 'obj
e
cts
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herlan
d
builtin-notes: Add "prun
e
" subcomm
a
nd for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herla
n
d
Notes API: prune_no
t
es(): Prune notes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
t3305: Verify that r
e
m
oving notes trigge
r
s
automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-
n
otes: Add
"
remove" subc
o
mmand for removi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach
b
uiltin-notes to re
m
ove empt
y
n
o
tes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Tea
c
h notes code to properly
pr
e
serve no
n
-
n
otes
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
t3305: Verify that a
d
ding many
notes with
g
it-
n
ote
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
and
t
3
3
01: V
e
r
i
fy successful an
n
otat
i
on of
n
on-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builtin-ify git
-
note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an
He
r
land
Refactor no
t
es concatenation into a f
l
exible int
e
r
f
a
ce
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Not
e
s API: Allow m
u
ltiple concurrent n
o
tes trees wi
t
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
No
t
es API: wr
i
te
_
n
otes_tree(): S
t
ore the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API
:
for_ea
c
h_no
t
e(): Traverse the entire
n
o
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes AP
I
: ge
t
_note(): Ret
u
rn the note ann
o
tating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: r
e
move_note()
:
R
emove note obj
e
c
ts from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
nd
N
otes API: a
d
d
_note(): Add
n
ote objec
t
s t
o
t
h
e internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
H
erland
Notes
A
P
I: init_notes(): Initialize th
e
no
t
es
t
ree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an
Herland
A
d
d tes
t
s for
c
heck
i
ng corre
c
t handling of $GIT_NOTES_
R
EF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: get_com
m
i
t
_notes() -> format_no
t
e()
+
remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Minor cosmetic fix
e
s to not
e
s
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builtin-conf
i
g: Fix crash when using "-f
<relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Ad
d
more test
c
ases to tes
t
fast-
i
mport of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next