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 'jc/grep--no-index-pathspec-fix'
2011-02-16
Johan Herland
p
u
sh
.
d
e
fault:
Rename 'tracking' to
'
upst
r
eam'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
lan
d
Prov
i
de 'git merge --abor
t
'
as a synon
y
m to
'git rese
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
cmd_merge(): Parse options before c
h
eckin
g
M
ER
G
E_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
P
rov
i
d
e 'git no
t
es
g
e
t-r
e
f
'
to
e
asily retri
e
ve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it
not
e
s merg
e
: Add testcase
s
for merging notes
t
rees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
g
it
n
o
tes merge: Add another auto-
r
eso
l
vi
n
g stra
t
egy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git n
o
tes mer
g
e: --commit should
fail if underly
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git note
s
merge:
L
ist conflicti
n
g notes
i
n
notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git not
e
s merge:
Manual conflict resolution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes m
e
rge: Ma
n
ual
c
onflict
resolution,
p
art 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
Documentat
i
o
n
: Pre
l
i
minary docs on 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
g
it n
o
tes merge: Add
a
utomatic c
o
nfli
c
t resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes merge: Handle real, non-
c
o
nflicting
n
o
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
rland
builtin/notes
.
c: Refactor creation of notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merge
:
Ini
t
ial implemen
t
ati
o
n handling
t
rivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Her
l
and
builtin/notes
.
c: Split notes ref
D
W
IMm
e
r
y in
t
o a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
notes
.
c: Use two new
l
in
e
s
(instead of one)
when c
o
ncatena
t
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
(tr
i
vial) t3
3
0
3
: Indent w
i
th tabs instead of
s
paces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
n
otes
.
h
/
c: Propagate combine_notes_
f
n re
t
u
rn val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
notes
.
h/c: Allow c
o
mbine_notes
f
unc
t
ions
t
o remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
c: Re
o
rder func
t
ions
i
n preparation for ne
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herla
n
d
notes
.
h: Mak
e
defa
u
lt_
n
o
tes_ref() available in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(tr
i
vial) notes
.
h: Minor documen
t
ation fixe
s
to copy
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
Herl
a
nd
notes
.
c: Hex
i
fy
SH
A
1
i
n
die() message from
init_not
e
s(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
oh
a
n Herland
notes: Don't
create
(empty) commit when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herland
Enabl
e
cus
t
o
m
schemes for column c
o
lors in
t
he
g
raph AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
erl
a
nd
M
a
k
e gr
a
ph_next_line()
a
vailable i
n
t
h
e graph
.
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
revision: Tu
r
n
o
ff history
s
i
m
plification
i
n --a
n
c
e
stry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fix t
y
po in --ancestr
y
-
path
er
r
or message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
land
Doc
u
mentati
o
n/rev
-
lis
t
-o
p
tion
s
.
txt
:
Ex
p
lain
-
-ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docume
n
tati
o
n
/
re
v
-
l
i
st-options
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensure "index $
f
rom
.
.
$t
o
"
lin
e
c
o
ntai
n
s unambigu
o
us
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan H
e
rland
builtin-
n
otes: Minor (mostly parse_options
-
related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
a
n Herland
submodule summar
y
: Don't barf w
h
e
n invo
k
ed in an
e
mpty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
b
uiltin-notes: Add "copy" subcomm
a
nd for copyi
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-no
t
es: Mi
s
c
.
r
e
f
actoring of argc and exit v
a
l
ue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n
H
e
rland
b
uilt
i
n
-
n
ote
s
: Add
-c/-
C
options
for
r
eusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
er
l
and
b
u
iltin-n
o
t
es: Refactor handling o
f
-F option to allo
w
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
bu
i
ltin-notes: De
p
recate th
e
-
m/-
F
op
t
ion
s
f
o
r
"git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
la
n
d
bui
l
tin-n
o
te
s
: Add "a
p
pend" subcommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
l
t
in-no
t
es
:
A
dd "add" s
u
b
c
ommand for ad
d
ing not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
land
b
u
i
ltin
-
notes: Add --me
s
sage/--file alias
e
s
for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-n
o
tes: Add "list"
subcommand for li
s
tin
g
n
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Do
c
u
m
entation: Generalize git-notes docs
t
o '
o
bject
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
l
a
nd
bu
i
lti
n
-notes: Add "prune"
s
ubcommand for
r
emoving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes API: prune_n
o
tes(): Pr
u
ne
n
otes tha
t
bel
o
ng to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
t3305: Verify
t
h
a
t re
m
ov
i
ng notes trig
g
ers automat
i
c
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
an
d
b
uiltin-notes:
A
d
d
"
r
emove" subcommand for r
e
moving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
Teach b
u
iltin-notes to rem
o
ve em
p
ty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
T
each no
t
e
s code to pr
o
p
e
rly pr
e
serve non-
n
otes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
t3305:
Verify
that ad
d
ing m
a
ny notes with git
-
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301: Verify successful annotat
i
on
o
f
non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
Builtin-ify git-not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
R
e
factor notes
c
o
n
c
a
tenation into a fle
x
ible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
N
otes API
:
A
l
low multiple concur
r
ent notes
t
r
ees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: writ
e
_notes_tree(): S
t
ore the notes tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
and
Notes AP
I
: for_each_note(): Traverse
t
he entire no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
an
d
No
t
es API
:
get_note(): Re
t
urn
the not
e
an
n
o
tating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herl
a
nd
N
o
t
e
s API: remove_note
(
): Remo
v
e note objects
fr
o
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API: add
_
not
e
(): Ad
d
note obje
c
t
s
t
o the intern
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Not
e
s API: init_not
e
s(): Initi
a
lize the no
t
es
tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Add tests for che
c
king cor
r
ect handl
i
ng of $GIT_NOTE
S
_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
N
otes API: get_commit_no
t
es() ->
for
m
at_note() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Min
o
r cosmetic
f
ix
e
s to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
o
han Herland
b
uilt
i
n-config:
F
ix cra
s
h whe
n
using "-f <rel
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han Herland
Ad
d
more testc
a
ses
t
o tes
t
fast-import of no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9301 to
t9350,
t
o make room
for m
o
re
f
as
t
-impo
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herl
a
n
d
fas
t
-
i
mpor
t
: Proper notes
t
ree m
a
nip
u
l
ation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Jo
h
a
n
Herland
Fi
x
crasher on
e
nc
o
u
n
teri
n
g SHA
1
-
l
ike
n
on-no
t
e in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Jo
h
a
n
He
r
land
Basic buil
d
infrastructure for P
y
thon s
c
r
ipt
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Her
l
an
d
Add selftests verifying concatenation of multiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
l
and
Refac
t
or notes code to
c
oncatenate multiple notes annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herlan
d
Add
s
elftests v
e
rifying t
h
at we can parse note
s
tree
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Herlan
d
Teach
t
he notes looku
p
code
t
o parse notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
Teac
h
n
o
te
s
code to free its
i
nt
e
rnal data str
u
ctures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
r
l
and
A
d
d flags to get_commit_notes() to con
t
rol
th
e
form
a
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
H
e
rland
t3302-notes-i
n
dex-e
x
p
e
nsive: Speed up
cre
a
t
e
_
repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
a
n
d
fast-import: Add
s
upport for importing commit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Te
a
ch "-m <msg>"
a
n
d "-F <
f
ile>" to
"git notes e
d
it"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
J
o
han H
e
rlan
d
git cl
o
ne: Add -
-
recursi
v
e
t
o automatically checkou
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Her
l
and
t
7407: U
s
e
'rev-p
a
rs
e
-
-
short'
r
ather than b
a
sh's subs
t
ring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an H
e
rland
git s
u
bmo
d
ule s
t
at
u
s
: Add --r
e
cursive to recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rland
git submo
d
ul
e
update: Introduce --re
c
u
rsive to
u
p
date
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan
Herland
git subm
o
dule fore
a
ch: Add --recu
r
si
v
e
to r
e
cur
s
e into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han Herland
git subm
o
d
u
le forea
c
h: test access to subm
o
dule name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
h
a
n Herland
Add selftest
f
or 'g
i
t submodule
f
oreac
h
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submo
d
ul
e
: Cle
a
n
u
p usag
e
s
tring and
a
d
d
optio
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan Herlan
d
git submodu
l
e foreach
:
P
rovide access to submodule
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
J
ohan He
r
l
and
h
e
lp
.
c
:
give co
r
rec
t
structure's size
to memset(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan Herland
quickfetch(
)
:
P
re
v
ent overflow o
f
the rev
-
list co
m
mand
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Jo
h
a
n He
r
land
g
i
t-submodul
e
: add support fo
r
--merge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
Rename submodule
.
<
n
am
e
>
.
rebase t
o
s
ub
m
odule
.
<name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
J
ohan
H
erlan
d
U
pdate do
c
s
on behav
i
our of 'c
o
re
.
sharedRe
p
o
s
i
t
ory
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
J
ohan Herland
Move
c
hmod(foo, 04
4
4) into move_temp_to_file()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herland
Use strchrnul() instead
o
f strc
h
r() plu
s
m
a
nual workaround
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan He
r
land
Fix su
b
module sync
w
ith relative su
b
module URLs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
J
o
han
Herland
for-eac
h
-ref
:
Fix --format=%(subject) for log mess
a
ge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Johan Herlan
d
F
ix AsciiDoc
errors in me
r
ge doc
u
men
t
ation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
Joh
a
n Herla
n
d
B
rin
g
local cl
o
ne's origin URL in line with that of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
Jo
h
an
Herla
n
d
Teach
"
g
i
t d
i
ff
-
p
" HTML funcnam
e
p
a
tterns
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next