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
git-svn: (cleanup) remove editor param passing
2014-04-19
Johan Herland
Gi
t
2
.
0: g
i
t svn: Set default --prefix='origin/' if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
Johan Her
l
and
n
otes: disallow reusi
n
g non-b
l
o
b
a
s a note object
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
Jo
h
an Her
l
and
s
h
a1_file
.
c:cr
e
ate_tmp
f
ile(): Fix r
a
ce when creati
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
J
o
han Herla
n
d
gi
t
-svn: Warn about changing def
a
ult
f
o
r --prefix
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herland
Documentati
o
n
/
git-svn: Promote the use of --prefix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
J
ohan Herland
samp
l
e pre-commit hook: use -
-
bool when retrie
v
i
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan H
e
rland
t3200: Add test d
e
monstrat
i
n
g minor reg
r
ession in
4
1
c
2
1f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
Refer
to
branch
.
<name>
.
r
emote/merge
w
h
en
d
ocumen
t
in
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han Herland
t3200:
Minor fix w
h
en pre
p
aring for
t
racking failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n Herland
t2024: Fix
&
&-chainin
g
and a
c
ouple o
f
t
y
po
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joha
n
H
e
rl
a
nd
Move create_notes_com
m
it() fr
o
m notes
-
m
e
rg
e
.
c
i
nto
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herlan
d
Move copy_note_for
_
rewrite +
friends from bui
l
tin/n
o
te
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
f
i
nish_copy
_
notes_for_rewrite()
:
L
e
t caller pr
o
vide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
n
d
g
lossary:
U
pdate
a
nd rephrase the def
i
ni
t
ion of a
r
emote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c
:
Val
i
date tracking bra
n
ch
e
s with
refs
p
ecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t9114
.
2
: Don't use --tra
c
k option ag
a
in
s
t
"svn-re
m
o
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
t7201
.
24: Add
refspec
t
o
k
e
e
p --tra
c
k
working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
a
n
d
t
3
200
.
39: tracking setup shou
l
d fail if there
i
s no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
oh
a
n H
e
rlan
d
checko
u
t: Use remote refspecs
w
hen DWIMmin
g
track
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t2024: Show failure to
u
se re
f
s
p
e
c whe
n
DWIMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
t2024
:
A
dd test
s
ve
r
ifying current DWIM behavior
o
f
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
git symbolic-ref --delete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
Herland
F
ix f
a
ilure to
delete
a packed ref through a s
y
mre
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herl
a
nd
t
1
400-update-ref:
A
dd test verifying bug with
symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
oh
a
n Herland
notes-merge: Don't remove
.
g
it/NOTES_MERGE
_
W
O
R
K
TREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herlan
d
n
o
tes-me
r
ge: use opendir/read
d
ir 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
Joh
a
n Her
l
and
t3310: i
l
l
ustrate failure to "notes merge --com
m
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Herland
fast-import: Fix incorrect
f
anout level wh
e
n modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herlan
d
t9301: Add 2n
d
tes
t
case
e
xposi
n
g
bug
s
in fa
s
t-i
m
port
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
e
r
la
n
d
t9301: Fix t
e
s
t
c
ase covering u
p
a bug in fast-impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix a couple of
t
yp
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Her
l
and
Mark di
r
s
t
at er
r
or messages for trans
l
a
t
ion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erla
n
d
Improve err
o
r
handling w
h
en pars
i
ng
dirstat paramet
e
rs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
New --dirstat=
l
ines mode, doing dir
s
t
at analysis bas
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han H
e
rland
Allo
w
specifying --dirs
t
a
t cut-off percentag
e
as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han
H
e
rland
Add confi
g
variable for s
p
ec
i
fying defa
u
lt --dirsta
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Her
l
and
Refacto
r
--dirstat parsing; depreca
t
e
-
-
cu
m
ulativ
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Make --d
i
r
s
tat=0 output dire
c
tor
i
es that c
o
n
tr
i
bute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
H
e
rland
A
dd several testca
s
es for --dirstat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herl
a
n
d
--dirstat: In cas
e
of renames,
u
se
t
arget filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Te
a
ch --dirs
t
at not t
o
completely ignore rear
r
an
g
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
and
-
-
d
irstat-by-file: M
a
ke it
f
a
ster and more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-
dirstat: Describ
e
non-obvious differ
e
nces rel
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joha
n
Herland
Make "git notes add" more user-fr
i
e
n
dly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
H
erland
lo
g
/
pretty-op
t
i
o
ns: Document --[no-]notes
and
d
eprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Jo
h
an Herland
branch/ch
e
cko
u
t --track: Ens
u
re that upstr
e
am bra
n
ch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
pu
s
h
.
de
f
ault: Rename 'trac
k
ing' to
'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
Provide 'g
i
t merge --ab
o
rt
'
as a s
y
no
n
ym to 'gi
t
reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
c
m
d
_
m
e
rge(): Pars
e
options
before checking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
Provide 'git not
e
s get-ref'
t
o easily retrieve curre
n
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
es merge:
A
d
d testcases for m
e
rgin
g
no
t
es tre
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes merge:
A
dd anoth
e
r
a
ut
o
-resolving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
g
i
t not
e
s merge: --c
o
mm
i
t
s
hould fail if
u
nderly
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
gi
t
no
t
es
merge: List confl
i
cti
n
g notes in not
e
s merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
an
d
git notes m
e
rge:
M
anual co
n
fli
c
t re
s
olutio
n
, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merge
:
M
a
nual
c
onflict resolution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Documentation
:
Pre
l
imi
n
ary doc
s
on 'git n
o
tes
m
erge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merg
e
: Add a
u
tomatic conflict r
e
solvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an He
r
l
a
n
d
git notes merge: Handle real, non-conflicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
land
builtin/notes
.
c:
Refa
c
tor creati
o
n
of n
o
tes 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
mplementation handling
trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herland
builtin/notes
.
c: Split notes ref DW
I
Mmer
y
into a s
e
parate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
n
otes
.
c: Us
e
two newlines (instead
of one) when conc
a
te
n
atin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
land
(trivi
a
l) t3303: I
n
d
ent wi
t
h tabs i
n
stead
of spa
c
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
notes
.
h/c
:
Propag
a
te combine_no
t
e
s_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c: Allow comb
i
ne_
n
otes f
u
nctions
t
o remo
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rland
not
e
s
.
c: Reorder fun
c
tions in pre
p
aration for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Make defau
l
t_notes
_
ref() available i
n
notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
(trivial) no
t
es
.
h: Minor
d
o
c
u
me
n
tat
i
on fixes to c
o
py_no
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
note
s
.
c
:
H
exif
y
SHA1 in di
e
(
) m
e
s
s
a
ge from
init_
n
otes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joh
a
n He
r
land
n
ote
s
: Do
n
't create (empty) commit
w
hen remo
v
ing
n
on
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an Her
l
and
Enable
c
ustom
sc
h
emes for col
u
mn colo
r
s in the graph
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
h
an Herland
Mak
e
graph_next_line()
a
va
i
lable in t
h
e graph
.
h
A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
revision: Tu
r
n off
h
istory sim
p
lification in --
a
n
cest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herl
a
nd
r
e
v
isi
o
n
:
Fix typo in --anc
e
stry-path err
o
r message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
Documentation/rev-l
i
st
-
opt
i
ons
.
txt: Explain --
a
ncestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
Docum
e
ntation/rev-li
s
t-
o
ptions
.
tx
t
: Fi
x
m
issing lin
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Joh
a
n
Herland
diff
.
c: Ensure "index $from
.
.
$to"
line contains unambigu
o
u
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Joh
a
n He
r
land
builtin-
n
ote
s
:
Minor (
m
o
s
tly pa
r
se_options-r
e
lated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Joha
n
Her
l
and
submodule
summary: Don'
t
barf
when invoked in an
e
mpty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
b
u
iltin-notes: Add
"
copy" sub
c
ommand for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
b
uiltin-note
s
: M
i
s
c
.
refa
c
tor
i
n
g of argc
and exit va
l
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herla
n
d
b
uiltin-not
e
s: Add -c/
-
C options
f
or reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
bui
l
tin-notes:
R
efacto
r
handli
n
g o
f
-F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
bui
l
t
i
n
-notes
:
Deprecate the -m/-F o
p
tions
for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
builtin
-
n
otes
:
Add "appe
n
d" s
u
bcommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in
-
n
o
tes:
A
dd
"add" s
u
bcommand for a
d
ding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
builtin-notes:
A
d
d --messag
e
/--file al
i
as
e
s fo
r
-m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
nd
builtin
-
note
s
: Add "list
"
subcommand for li
s
t
ing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
D
ocume
n
tat
i
on:
G
ene
r
alize git-notes d
o
cs 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 "prune"
s
ubco
m
ma
n
d
for
removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an H
e
rland
Notes
API: prun
e
_no
t
es(): Prune notes
that belong t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
t3305: Ver
i
fy th
a
t removing notes triggers auto
m
a
t
ic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
b
u
iltin-notes: Add "remove"
s
ubc
o
mm
a
nd fo
r
rem
o
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erla
n
d
T
each builtin-not
e
s to
remo
v
e empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Teach notes code to properly preserve no
n
-notes
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: V
e
rify that
a
dding man
y
notes with
g
it-note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
01:
Verify success
f
ul annotati
o
n o
f
non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Builtin-ify
g
it-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refactor notes concatena
t
ion into a
fl
e
xi
b
le interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next