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-branch: use strbuf in fill_tracking_info()
2008-11-18
M
iklos Vajna
buil
t
in
-
b
r
anch:
u
se strbuf
i
n
f
ill_tracking_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s
Vajn
a
built
i
n
-
branch: use
s
trbuf i
n
del
e
te_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
iklos
Vajna
git-remote:
document the migrat
i
on feature
of the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-r
e
mot
e
rename: migr
a
te from re
m
otes/ and bran
c
hes/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos
Vajna
re
m
ote: a
d
d
a
new 'ori
g
i
n' vari
a
ble
to the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
I
mplement git remote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajna
up
d
ate-r
e
f
--n
o
-
deref
-
d: handle the case w
h
en
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Mik
l
os Vajn
a
g
it branch -m
:
f
o
rbi
d
renaming
of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos Vajna
F
i
x git up
d
ate-ref --no-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mik
l
os Vajna
rename_ref(): handle the case wh
e
n the reflo
g
of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klos Vajn
a
Fix git branch -
m
f
o
r symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
p
arse-opt: migrate bui
l
tin-checkout-inde
x
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mikl
o
s Vajna
Add t
e
stcase to ensure mergin
g
a
n e
a
rly part of
a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos
Vaj
n
a
Add Linux
P
P
C
su
p
port
to the pre-au
t
o-gc e
x
ample
hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Mi
k
los
V
ajna
test-lib:
fix color res
e
t i
n
say_
c
ol
o
r()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos V
a
j
n
a
Implem
e
n
t
g
it
clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mikl
o
s Vajna
Cleanup in sha1_file
.
c:
:
cache_or_
u
np
a
c
k_en
t
ry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vaj
n
a
buil
t
in-commit: use reduce_heads(
)
only
w
hen appropri
a
t
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mik
l
os Vajna
b
uiltin-
m
e
rg
e
: re
f
resh t
h
e index before ca
l
l
i
ng a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jna
t
7
603: add new
t
e
stcases to ensure
bui
l
tin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s Vajna
b
u
i
ltin-commit: use co
m
m
it_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
a
jn
a
commit_
t
r
e
e
(): add a
n
ew auth
o
r
p
arameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7501:
al
w
a
ys use te
s
t_cmp instead
of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklo
s
Va
j
na
built
i
n-merge: release the l
o
ckfile in try_
m
e
r
ge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los
V
ajna
m
erge-recurs
i
ve:
get rid of v
i
rtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
e
rge-recursive: move cu
r
rent
_
{file,dir
e
ctory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vaj
n
a
m
erge-
r
ecursive: move the gl
o
bal obuf to struct merge_o
p
tions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Vajna
merge-rec
u
rsive: get rid of the index_
o
nly global variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos V
a
jna
mer
g
e-rec
u
rsive: mo
v
e
call_depth to struct m
e
rg
e
_
o
pt
i
ons
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajn
a
Makefile:
add mer
g
e_recurs
i
ve
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
cherr
y
-pick/revert:
m
a
ke dir
e
ct internal call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
M
i
k
l
os Va
j
na
builtin-mer
g
e: avoid run_c
o
m
mand_v_opt() for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
m
erge-recurs
i
ve:
i
ntrodu
c
e me
r
ge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
lo
s
Vajna
Split out mer
g
e_r
e
c
u
rsive() to
merg
e
-recursiv
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Mi
k
lo
s
Vaj
n
a
M
a
kefile: enable SNPRINTF_RETURN
S
_BOGUS fo
r
H
P
-
U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos V
a
jna
Fix 'git
help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
Vajna
t9300: replace '!' with
t
e
st_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mi
k
los Vajna
Doc
u
m
e
ntation: document the pager
.
* con
f
ig
u
ra
t
ion sett
i
ng
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos V
a
jna
Builtin
git-h
e
lp
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
builtin-help: always l
o
a
d_
c
ommand_list() i
n
cm
d
_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vajna
Add a second testcas
e
for
h
andling i
n
valid strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a new test for using a custom merge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
bu
i
lt
i
n-m
e
rge: allow usi
n
g a custom strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
b
ui
l
t
in-he
l
p: ma
k
e
s
o
m
e interna
l
functions avai
l
abl
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mikl
o
s V
a
jna
t7601: extend th
e
'merge picks up the
best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos
Vajna
builtin-merge
:
gi
v
e a p
r
oper error message
f
or inva
l
id
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Va
j
na
Teach 'git merge' that some merge strategies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos Va
j
na
A
dd
a new test for gi
t
-merge-res
o
lve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021:
add a new tes
t
for git-m
e
rge
-
resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
ajna
make remove-
d
a
s
hes: apply to sc
r
ipts an
d
programs a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklo
s
Vajna
git-bis
e
ct: use dash-
l
ess form on
git
b
i
s
ec
t
log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-
h
ash-object
.
sh: use quotes for the test
d
e
scriptio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vaj
n
a
t0001-ini
t
.
sh: change confusing dire
c
tory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos V
a
jna
B
u
ild in me
r
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos
V
ajna
Fix
t7601-merge-pull-
c
onfig
.
s
h
on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s
V
ajna
git-co
m
mi
t
-tre
e
:
mak
e
it
u
sable from othe
r
buil
t
ins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
A
dd new test ca
s
e to
e
nsure git-me
r
ge
prepen
d
s
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
kl
o
s Vajna
hg-to-git: use git init instead of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git
:
r
ewrite "git-frotz
"
t
o
"git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajn
a
hg
-
to-git: ab
o
rt if the p
r
oject directory
i
s not
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to
-
git: avoid
r
a
i
sing a string
e
x
ception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
aj
n
a
INSTALL: Update
section about git-f
r
o
t
z form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Mik
l
o
s
Vaj
n
a
R
etire
'stupid'
merge st
r
ate
g
y
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Add new test case to e
n
sure git-merge reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
o
s
Vajna
Add new test
t
o ensu
r
e
git-merge handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
ik
l
os Vaj
n
a
In
t
roduce get_octopus_merge_bases() in
c
o
mmit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
g
it-fmt-merg
e
-msg
:
make it u
s
able from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
ove read_cache_unme
r
ged(
)
to read-cac
h
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Ad
d
new test
t
o ensure git-
m
erge handl
e
s pull
.
t
wohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s
Va
j
na
Move parse-opt
i
ons's ski
p
_prefi
x
(
)
t
o git-
c
ompat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Move comm
i
t
_li
s
t_count() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Va
j
n
a
Move split_cmd
l
ine()
t
o
alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
i
k
los Va
j
na
p
a
th-list doc
u
m
e
ntation: document all functions
a
nd
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
run
-
co
m
mand documentation: fix "m
e
mset(
)
"
p
arameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Mi
k
los
Vajna
git-read-t
r
ee:
d
ocum
e
nt -v o
p
tion
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
Vajna
A
simple s
c
ript to pars
e
t
h
e results from the te
s
t
c
ases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
k
l
os Vajna
git-r
e
ba
s
e -i: mention the
short com
m
and aliases
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos Vajna
Remove
u
nused code in parse
_
c
om
m
it_b
u
f
fer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Va
j
na
Strbuf
documentation: document m
o
st functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
iklos Vajna
Revision walkin
g
do
c
u
m
e
nt
a
tion: document most imp
o
rtant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mi
k
los
Vajna
CodingGuidelines: Add a note to
avoi
d
ass
i
gnments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mi
k
los Va
j
n
a
git
-
merge:
exclude unnecessary op
t
ions
from O
P
TIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Mikl
o
s Vajna
git-fa
s
t
-import: ren
a
me cmd_*() function
s
t
o pa
r
se_
*
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos V
a
jna
INSTA
L
L: add a note abo
u
t GNU interactive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
Vajna
Add
te
s
ts for sendemail
.
cc
c
onfigurati
o
n variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vaj
n
a
git-
s
end-email
:
a
d
d a
n
ew sendemail
.
cc con
f
ig
u
ration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos Va
j
na
git-format-patch: add a n
e
w
f
o
rmat
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git che
c
kout: add
-t
a
lia
s
f
or --
t
rack
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
diff
o
ptions d
o
cumentation: refer to -
-
diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vajna
c
o
ntrib/hooks:
add an ex
a
mple pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos
V
ajna
Do
c
u
m
entation/hooks: add pre-
a
uto-g
c
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos Vajna
git-gc --auto:
a
dd
pre
-
a
uto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Mi
k
los Va
j
na
Documentation/git
-
me
r
ge:
d
ocument subtr
e
e stra
t
egy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mik
l
os Vajna
g
i
t-gui: Update
d
Hungar
i
an translation (e5
f
ba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos V
a
jna
Update Hungarian t
r
anslation
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Impr
o
v
e t6029 t
o
c
h
eck the
r
eal "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Doc
u
me
n
tation/git svn log: a
d
d a n
o
t
e
about timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
M
iklos Vajna
D
o
c
umentati
o
n/git-filter-branch: add a n
e
w msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Mi
k
los Vajna
gi
t
-clea
n
: h
a
ndle errors if
r
e
m
oving files
fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
V
ajna
Do
c
ument
a
tion/git-stash: document opt
i
ons for git
s
tash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next