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
builtin/notes: simplify early exit code in add()
2014-11-12
Johan Herland
builtin/notes: si
m
p
l
ify e
a
rly ex
i
t
code in ad
d
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan He
r
land
builtin/notes: refa
c
tor note file p
a
th into struct
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
b
uil
t
in/
n
ote
s
: i
m
prove naming
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
t
330
1
:
verify that 'git
n
o
tes' rem
o
ves
e
mpty n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herlan
d
bu
i
ltin
/
notes: f
i
x pre
m
atu
r
e fail
u
re w
h
en trying to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-04-19
Johan Herland
Git 2
.
0
: git svn: S
e
t default -
-
prefix='origin/' if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
Joh
a
n Herla
n
d
notes: disa
l
low re
u
sing non-blo
b
as a not
e
obje
c
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
Johan Herland
sha1_file
.
c
:
create_tm
p
file
(
): F
i
x
r
a
ce wh
e
n
creating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herlan
d
git-svn: Wa
r
n about changing defaul
t
for --prefix in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan
H
erland
Documentation/git-svn: Promote the use of --prefix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Joh
a
n
Herl
a
nd
sample pr
e
-commit hook: u
s
e --
b
ool when retrieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan H
e
rla
n
d
t3200:
A
dd test
demon
s
trating minor re
g
re
s
sion in
41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an Herlan
d
Refer to
branch
.
<n
a
m
e>
.
remo
t
e/m
e
rge
when documen
t
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an Herl
a
nd
t32
0
0: Mino
r
fix when pr
e
pa
r
i
n
g
for tracking failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n Herland
t2024:
F
ix &&-ch
a
ining a
n
d
a
c
o
uple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herl
a
nd
Move
c
re
a
te_notes_commit() from notes-merge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move copy_n
o
te_for
_
rewrite + friends from bu
i
ltin/
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan H
e
r
l
and
fi
n
i
sh_copy_
n
o
tes_for_rewrit
e
(): Let calle
r
provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
H
e
rland
gloss
a
ry: U
p
date and r
e
phr
a
se
the
definition of a remo
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herlan
d
branch
.
c: Validate tracking branches with r
e
fs
p
ecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an He
r
la
n
d
t9114
.
2
:
D
o
n't use --track option against
"svn-
r
emote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Her
l
and
t7201
.
24: Add r
e
fspec to
ke
e
p --track w
o
r
king
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
t3
2
00
.
39:
tra
c
king setup should fail if there i
s
n
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herl
a
nd
checkout: Use
r
e
mote refspecs when DWIMming tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
nd
t2024: Sh
o
w fa
i
lure to use refspe
c
when DWI
M
ming remot
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
202
4
: Add tests verifying
current DWIM behavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
land
git s
y
mbolic-ref -
-
delete $symr
e
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herla
n
d
Fix failure to delete a packed ref through
a
symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t1400-update-ref
:
Add tes
t
veri
f
yi
n
g bug wi
t
h symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-me
r
ge: Do
n
't remove
.
git/NOTES_ME
R
G
E_WORKT
R
EE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan
H
erland
no
t
es-merge: use op
e
ndir/
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 Herland
t3310: ill
u
strat
e
fai
l
u
r
e
t
o
"notes merge
--commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
f
ast-impor
t
:
Fix inc
o
rre
c
t fan
o
u
t
level when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an Herland
t9
3
0
1: Add 2
n
d testcase
e
xposing bug
s
in
f
ast
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301:
F
ix testcase coveri
n
g up a bug in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an Herla
n
d
t
5400: Fix a coup
l
e of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Mark
di
r
stat error
messages for tran
s
lation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
an H
e
rland
I
mprove er
r
o
r
handling when parsing dirstat par
a
mete
r
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
N
e
w --d
i
rstat=lines mo
d
e, doi
n
g di
r
stat analy
s
is
based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
llo
w
spe
c
ifying --d
i
rstat cut-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
dd con
f
ig
variable for specifyi
n
g defa
u
l
t
-
-dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
Re
f
actor --dirstat parsing; deprecate --cu
m
ul
a
tiv
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
M
a
ke --dirst
a
t=0 output director
i
es that cont
r
i
bu
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan He
r
land
Ad
d
several testca
s
es
f
or -
-
dirst
a
t
and
friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan
H
erland
-
-dirstat: In
case
o
f renames, us
e
target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach
-
-
d
irstat not t
o
compl
e
te
l
y ignor
e
rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-
dirstat-
b
y-file: Ma
k
e it faster an
d
more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
--
d
irstat: Describe n
o
n-
o
b
v
ious dif
f
erences
rel
a
t
i
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han Herland
M
a
ke
"
gi
t
notes add"
more user-
f
riendly w
h
en
there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joha
n
H
e
rland
log/pre
t
ty-options: Doc
u
ment --[no
-
]
notes and
d
eprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joha
n
Herland
branch/check
o
ut
-
-tra
c
k: Ensure that ups
t
ream
b
r
a
nch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Her
l
a
n
d
push
.
de
f
aul
t
: Rename 'tr
a
cking' to 'upstream
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
Provide 'git mer
g
e --abort'
a
s a
sy
n
onym to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
cmd_merge(): Parse opti
o
ns
b
efore c
h
ecking MERGE
_
H
E
AD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
Provide
'
g
i
t
note
s
get-ref'
t
o easily retrieve curr
e
n
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herla
n
d
git
notes merge
:
A
dd t
e
stcase
s
f
or merging
notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
Herland
git
n
o
tes merge: A
d
d anoth
e
r auto
-
resolving
s
tra
t
egy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git notes
m
erge: --commit shou
l
d fail
if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
land
gi
t
not
e
s merg
e
:
List con
f
lictin
g
notes in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes merge
:
M
anual confli
c
t
r
e
s
o
l
ution, pa
r
t
2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
Herlan
d
git notes m
e
rg
e
: Man
u
al conf
l
ict
resolu
t
ion, part 1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
l
a
nd
Do
c
umen
t
ation: Preliminary docs
o
n 'git n
o
tes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git
notes merge: Add autom
a
tic conflict re
s
olver
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
H
andle rea
l
,
n
on-conflicting
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
b
uiltin/notes
.
c: R
e
factor creation of notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git n
o
tes merge: In
i
tial imple
m
entati
o
n han
d
ling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c:
S
plit note
s
ref
D
WIMmery into a separa
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
o
tes
.
c: Use two
n
e
w
lines (instead of
one
)
wh
e
n con
c
atenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
(trivial) t
3
303:
I
ndent wit
h
tabs instead of
s
pace
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
notes
.
h/c:
Propag
a
te combi
n
e
_
n
o
tes_fn retu
r
n
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c: Al
l
ow combine_notes functio
n
s to remo
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
notes
.
c: R
e
order functions in preparation for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
notes
.
h
:
Make
d
efault_notes_
r
ef()
a
vailable in n
o
tes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) notes
.
h:
M
i
nor documentation fixes to copy_note
s
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
c: Hexify SHA1 in die()
m
essage from init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Don't create (em
p
ty) commit whe
n
rem
o
ving
n
on
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enab
l
e
c
u
s
tom schemes for colum
n
colors in
t
he
g
raph
A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han H
e
rl
a
nd
Make graph_next_line() availab
l
e in the
graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
a
n
d
revision: Turn off hi
s
tory sim
p
lific
a
t
i
on in --ances
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fix
typo in --ancestry-p
a
th
e
rror message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
oh
a
n Herlan
d
Documen
t
ation
/
rev-list-opt
i
ons
.
txt
:
E
xplain --ancest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docum
e
ntation/rev-list-options
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Joh
a
n H
e
rland
diff
.
c
: Ensur
e
"index
$fr
o
m
.
.
$
t
o" line c
o
ntains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-
n
otes: Minor (mostly parse_options-rel
a
ted
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Joha
n
Herland
submodule sum
m
ary: Don't barf whe
n
invoked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rl
a
nd
bu
i
lti
n
-notes: Add "co
p
y" subcomma
n
d for copying
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
builtin-notes: Misc
.
refactoring
o
f
argc and
e
xit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-notes: Add -c
/
-C options for re
u
si
n
g no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
il
t
in-notes: Refactor handling
of
-F op
t
i
o
n t
o
allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
D
epreca
t
e the -m/-F optio
n
s for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herland
builti
n
-notes: Add "appen
d
"
subcommand
f
or appendin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herland
b
u
iltin-
n
otes: Add "a
d
d" subcom
m
a
n
d f
o
r adding note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-not
e
s: Add --mes
s
age/-
-
file aliase
s
for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builti
n
-notes:
A
dd "lis
t
" subco
m
mand for l
i
sti
n
g n
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Docum
e
n
tation
:
Generalize
g
it-notes do
c
s
to '
o
bjects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herlan
d
buil
t
in-notes: Add "
p
rune" subcomm
a
n
d
f
or removin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: prune_notes(): Prune notes t
h
at belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
t33
0
5: V
e
rify t
h
at removing
n
otes trig
g
er
s
automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
i
l
tin-notes: Add "re
m
ove" s
u
bcommand for r
e
movi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Teach b
u
iltin-notes to remove empty
note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next