repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'master' of git://repo.or.cz/alt-git
2014-11-14
Johan Herland
t3301: moderniz
e
style
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herland
notes: empty notes should
be shown by 'g
i
t log'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herland
builtin/notes
:
a
d
d --al
l
o
w-empty, t
o
allow s
t
ori
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan
H
erland
builti
n
/no
t
es: split
create_note() to clarify
add vs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan
Herland
bu
i
ltin/notes: sim
p
lify ea
r
ly exit code in a
d
d()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
J
o
han He
r
land
buil
t
in/n
o
tes: refacto
r
n
ote f
i
l
e
path into struct
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
builtin/no
t
es: imp
r
ove naming
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
J
o
h
an H
e
rland
t3301: verify that 'gi
t
notes' remo
v
es emp
t
y notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan H
e
rland
builtin/not
e
s
:
fix prematur
e
failure when t
r
yin
g
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-04-19
Johan Herland
Git 2
.
0: git svn:
Set default
-
-prefix='orig
i
n
/
'
if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
J
o
h
a
n Herland
not
e
s: disallow reu
s
i
n
g
n
o
n-blob as a note object
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
J
ohan Herla
n
d
sha
1
_file
.
c:crea
t
e_
t
mpfile(): Fix race when c
r
eating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herlan
d
git-svn:
Warn about changing default for --
p
refix in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan
H
erland
Docum
e
ntation/g
i
t-sv
n
: Promote the use of
-
-
p
refix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
J
o
han Herland
sample pre
-
commit
hook: use -
-
bool when retrieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joha
n
H
erland
t32
0
0: A
d
d test dem
o
nstrating minor
r
egression in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han Herland
Refer to br
a
nch
.
<n
a
me>
.
re
m
o
t
e/merge whe
n
docu
m
enting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an
Herland
t3200: Minor fix when p
r
e
pari
n
g for tracking failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han Her
l
and
t
2
024: Fix &&-chaining and a couple
o
f
typo
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joh
a
n Herland
Move
c
reate_note
s
_commit() from notes
-
merg
e
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move copy
_
note_for_rewrit
e
+
f
riends fr
o
m builtin/n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joh
a
n Herland
finish_co
p
y_note
s
_for
_
rewrite():
Let cal
l
er pr
o
vide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
a
n Herland
g
l
ossary: Update an
d
reph
r
ase the def
i
niti
o
n o
f
a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erlan
d
b
r
anch
.
c: Va
l
id
a
te tracking b
r
anches
with refsp
e
cs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herl
a
nd
t9114
.
2: Don't
u
se --track option against "s
v
n
-
re
m
ote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
ha
n
Herland
t7201
.
2
4
:
Ad
d
refsp
e
c to ke
e
p --track w
o
rking
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t3200
.
39: tra
c
k
ing setup should fa
i
l i
f
there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
che
c
kout:
U
se remote refspe
c
s wh
e
n D
W
IMm
i
ng tra
c
kin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herlan
d
t2024: Show
f
ailure
t
o use
refspec wh
e
n DWIMmi
n
g
remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
202
4
:
Add
t
ests verifying cu
r
re
n
t
DWI
M
behavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Her
l
and
g
it sy
m
bolic-ref
-
-dele
t
e $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han Herlan
d
Fix failure to delete
a packed r
e
f t
h
r
o
ugh a sy
m
ref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t
1
400-upd
a
te-ref
:
Add
t
e
st
verifying
bug with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan He
r
l
and
note
s
-
merge: Don't remove
.
g
i
t/NOTES_ME
R
GE_WORKT
R
EE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herland
notes-merge: use opendir/
r
eaddir inst
e
ad of using
r
ead_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
t3310: illus
t
rate
fai
l
ure to "notes merge --c
o
mmit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
ha
n
Herland
fast-import: Fi
x
incorrec
t
fan
o
ut level when mod
i
fying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han
H
e
rland
t
9301: A
d
d 2nd testcase exposing bug
s
in
fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herla
n
d
t9
3
0
1: Fix testca
s
e covering up a bug
in fast
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an Herl
a
nd
t5
4
00:
Fix
a
c
ouple of ty
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
M
a
rk dirst
a
t error messages for tr
a
n
slat
i
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
I
m
prove
e
rror h
a
ndling when parsin
g
dirstat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
oh
a
n
He
r
land
New --dirst
a
t=lines mode, doing
d
irstat analy
s
is bas
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Allow speci
f
y
ing --d
i
rstat cut
-
off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an H
e
rl
a
nd
Add config
v
ariable for specifying
d
efaul
t
--
d
irs
t
at
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan
H
e
r
la
n
d
Refactor --dirstat p
a
r
sing;
d
epre
c
at
e
--cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan H
e
rla
n
d
Make
--dirst
a
t
=
0
output directories that
co
n
t
r
ibute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
d
d several testcase
s
for -
-
d
i
rstat and friend
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
o
h
an Herland
--dirstat: In case
of
rena
m
es,
use
t
ar
g
et
f
ilename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herland
Te
a
c
h --dirstat not to completely ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Her
l
and
--
d
irstat-by-fi
l
e: Make it
f
aster and
more cor
r
ect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
--
d
irstat: Descri
b
e non-obvious diff
e
renc
e
s relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
Make "git notes add"
m
ore user
-
fr
i
e
ndly
w
hen there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan He
r
lan
d
l
o
g/pretty-options: Docu
m
ent --
[
no-]not
e
s and dep
r
ecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
J
o
ha
n
H
e
rland
br
a
nch/che
c
kout --track: Ens
u
r
e that
u
p
s
t
ream b
r
anch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
oha
n
Herland
push
.
default:
Re
n
a
me 'tracking' to
'
upstrea
m
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
Pr
o
vide 'git merge --
a
bor
t
' as a synonym to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merge(): Par
s
e
options bef
o
re chec
k
ing MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
land
Provide 'gi
t
notes get-ref
'
to
easily ret
r
ieve
current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add t
e
s
tcases
f
or merging notes tree
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
land
g
i
t notes merge:
A
dd another
a
uto-re
s
olv
i
ng strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git note
s
merge: --com
m
it sh
o
u
ld
f
ai
l
i
f
underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
tes
merge: Lis
t
co
n
fli
c
ting notes in notes me
r
ge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git notes merge: Manua
l
conflict resol
u
tion, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git n
o
t
es m
e
r
ge: Manual confl
i
ct resoluti
o
n
,
part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n
H
erland
D
o
cumentation: P
r
eliminary docs on 'gi
t
notes
mer
g
e'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes mer
g
e
: A
d
d automatic
c
onflict res
o
l
vers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
an
d
g
i
t
n
o
tes m
e
r
g
e: Ha
n
dle real,
non-conflicting
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
land
builtin/n
o
tes
.
c:
R
efactor creation of n
o
te
s
c
ommits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan He
r
la
n
d
git notes merge: Initial implement
a
tio
n
handling triv
i
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
b
u
iltin
/
not
e
s
.
c: Spl
i
t notes ref DWIM
m
e
r
y into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use
t
wo newlines (instead of one) when
concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(triv
i
al
)
t
3
30
3
: Indent with tab
s
instead
o
f
space
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
notes
.
h/c: Prop
a
g
a
te comb
i
ne
_
notes_fn return v
a
lue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
n
otes
.
h/c: Allow combine_notes func
t
ions to
r
emove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan
H
e
rland
n
o
t
e
s
.
c:
Reorder fun
c
tio
n
s
in preparation for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herla
n
d
n
ote
s
.
h
: Make default_
n
otes_ref() av
a
ila
b
le
in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(tr
i
vial
)
n
o
tes
.
h: Mino
r
docume
n
t
a
tion
f
ixes to co
p
y_
n
o
tes
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c
:
Hexify
S
HA
1
in
d
i
e()
m
e
ssa
g
e from init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Don't create (empty) commit when removing
non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
ohan Herland
Enable
custo
m
s
c
he
m
es for
c
o
lumn color
s
in the gr
a
ph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
H
e
r
la
n
d
Make
graph_next_line() a
v
ailabl
e
in the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
r
l
an
d
revisio
n
: Turn off
hist
o
ry simpl
i
fication in --ancestr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han
Herla
n
d
revision: Fix typo in --ancestry-path er
r
or message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
Documentation
/
rev-list
-
o
p
tions
.
txt:
Expl
a
in
--an
c
estry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/rev-l
i
s
t
-o
p
tions
.
txt: Fix missin
g
line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herl
a
nd
diff
.
c: Ensure "index $from
.
.
$
to" lin
e
c
ontains una
m
b
i
guous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
o
ha
n
H
e
rland
bu
i
l
tin-notes: M
i
nor (mostly p
a
rs
e
_options-rela
t
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan He
r
land
submod
u
le summary: D
o
n't
barf
when invoked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-notes
:
Add
"copy" subcommand fo
r
c
opying no
t
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-notes: Mi
s
c
.
refactorin
g
of argc and ex
i
t val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes: Add
-
c/-C opt
i
o
ns for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
R
e
f
actor handling of -
F
option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builti
n
-not
e
s: Deprecate the
-
m/-F options for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herla
n
d
buil
t
in-no
t
e
s: Add "appe
n
d" su
b
c
o
mma
n
d fo
r
appe
n
d
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-
n
otes: Add "add" subcommand
f
o
r
addin
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
b
u
ilt
i
n-notes: Ad
d
--message/--f
i
le aliases for
-
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
b
u
iltin-no
t
es: Add
"list"
s
ubcommand for listin
g
n
o
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Docum
e
ntation: Genera
l
ize git-notes docs
to 'ob
j
ects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
o
t
es: Add "pru
n
e"
subcomm
a
nd for remo
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next