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-clone: use strbuf in guess_dir_name()
2008-11-25
Miklo
s
Va
j
na
builtin-clone: use
s
t
r
b
uf in guess_dir_name()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-br
a
n
c
h:
use st
r
buf
i
n
r
en
a
me_br
a
nch()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-bra
n
ch: use s
t
rbuf
i
n fill_tracking_info(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
o
s
Vajna
built
i
n-branch
:
u
s
e st
r
buf in delete
_
b
ranches(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-12
Mi
k
los Vajna
g
it-remote:
d
ocument the migration feature of t
h
e rename
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-remote rename: migr
a
te from remotes
/
a
nd b
r
anche
s
/
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-11
Mikl
o
s
Vajna
remote: add a new 'o
r
ig
i
n'
v
ariab
l
e
t
o
t
he struct
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-05
Miklos
Vajna
Implement git remot
e
rename
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajna
u
p
date-ref --no
-
de
r
ef -d:
h
andle
t
h
e
c
a
se when the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-30
M
iklo
s
Vajna
git branc
h
-
m
:
forbid renaming
o
f a
symref
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Mik
l
os Vaj
n
a
Fix git u
p
date-
r
e
f
--no-der
e
f -d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos Vajna
rename
_
ref(): hand
l
e
the case
when the r
e
f
l
o
g
o
f
a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix git branch
-
m for symrefs
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-19
Mik
l
os
V
ajna
par
s
e-opt:
m
igrate
b
uiltin-checkout-inde
x
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
Miklos
V
ajna
Ad
d
testca
s
e to ensure
mergi
n
g an early part of a branch
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
Miklos V
a
jna
Add Linux PP
C
s
u
p
p
o
r
t
to the
p
re-aut
o
-gc example hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-10
Miklos
V
a
jna
test
-
lib: fix
color reset in say
_
color()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
I
mpl
e
ment git clone -v
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
C
lea
n
up
i
n
sha1
_
file
.
c::ca
c
he_
o
r_unpack_en
t
ry()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vaj
n
a
builtin-
c
ommit: u
s
e reduce_heads() only when approp
r
iate
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vaj
n
a
bu
i
l
t
in-
m
e
rge:
r
e
f
r
esh
the index
before
c
alling
a
stra
t
e
g
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7603: add
new testcases to
ensu
r
e builtin-c
o
mmit use
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jna
builtin-commit: us
e
commit_tree()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
los
Vajna
com
m
it_tree(): add a
new author parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7501:
a
lways use test_
c
mp
i
n
s
tead of
di
f
f
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vaj
n
a
bu
i
ltin
-
merge:
r
e
le
a
se the lockfile in
try_merge_strategy
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklo
s
Vajna
me
r
ge-rec
u
rsiv
e
:
get ri
d
of v
i
r
t
ual_i
d
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Vajna
me
r
ge-recursive:
move current
_
{file,direct
o
ry}_set
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
M
i
kl
o
s
V
a
jna
merge-recursiv
e
: move
the
global o
b
uf
t
o
s
t
r
uct merge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
e
r
ge-recursive: get rid of the index_onl
y
global variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Miklos V
a
jna
mer
g
e-recursive:
m
ove ca
l
l
_d
e
p
th t
o
struct m
e
rge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Mikl
o
s
Vajna
Makefile: add merge_recursive
.
h to L
I
B_H
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
M
i
klos Vajna
cherry-p
i
ck/re
v
ert: mak
e
direct inter
n
al call
t
o merg
e
_
tre
e
(
)
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajn
a
bui
l
tin-
m
erge: avo
i
d
run_comman
d
_
v_opt() f
o
r recursi
v
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
merge-recur
s
iv
e
:
i
ntroduce merge_opti
o
ns
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Sp
l
it out merge_recursive() t
o
merge
-
recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
M
i
klos Vajna
M
akefi
l
e
: en
a
ble SNPRINTF_RETURNS
_
B
O
GUS for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
V
ajna
F
i
x 'git
h
elp
help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t
9
3
00: replace '!' w
i
th test_must_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Mi
k
los V
a
jna
Documentation: d
o
c
u
ment the pager
.
* configura
t
i
on
s
e
tting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Mi
k
los Vajna
Builtin git
-
help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
b
u
iltin-h
e
l
p
: always load_command_list(
)
in cmd_help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
Add a second testc
a
se for hand
l
ing invalid
s
trategi
e
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a new test
fo
r
usin
g
a custom me
r
ge strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
ik
l
os Vajna
builtin-merge: allow using a cus
t
om strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
bui
l
tin-help: make some internal functio
n
s avai
l
able
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Va
j
na
t
7
601: extend th
e
'
merge picks up
the best result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Mikl
o
s
Vajna
bui
l
ti
n
-mer
g
e
:
give a proper error
message for inv
a
l
i
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Mikl
o
s Vaj
n
a
T
e
ach 'git merge' that so
m
e merge strategies no
lo
n
ger
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add
a new test for git-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
t6021:
a
d
d a new test for git-
m
e
rge-reso
l
ve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
make remov
e
-
d
ashes: appl
y
t
o scripts and programs
a
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vajna
git-bisect:
u
s
e
dash-l
e
ss form on git bisect log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-h
a
sh-objec
t
.
s
h
: use q
u
ote
s
for the test description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajna
t000
1
-init
.
sh: change
c
onfusi
n
g
directory name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Mikl
o
s Vaj
n
a
Build in mer
g
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los Vajna
Fix t760
1
-
m
e
r
ge-pull-c
o
nfig
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-comm
i
t-t
r
ee: make it
u
sab
l
e
from other
builtin
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
l
os Vajna
Add new t
e
s
t
case to
ensure git-merge prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los
V
ajna
h
g-
t
o-g
i
t:
u
se
git i
n
it instead
of git init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-t
o
-git:
r
e
w
rite "git-fr
o
tz" to "git
frotz
"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
hg-to-git: abort if the project
directo
r
y is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git:
avoid r
a
ising
a string exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
j
na
I
N
STALL: Update
se
c
t
i
on abo
u
t git-frotz for
m
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
M
i
klos
V
ajna
Retire 'st
u
pid' merge strat
e
gy
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add new te
s
t case to ensure git-me
r
ge red
u
c
e
s octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Add new test to ensure
g
i
t-me
r
ge h
a
n
d
les more than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Introd
u
ce get_
o
ctopus_merge_
b
as
e
s() in commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merg
e
-msg: m
a
k
e
it usable from oth
e
r builtin
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajn
a
Move rea
d
_cach
e
_unmerged() to
r
e
a
d-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Ad
d
new
test to ensure git-merge handles pull
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
M
o
v
e
pa
r
se-optio
n
s's
skip_prefix(
)
to git-
c
ompat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Move co
m
mit_list_
c
o
u
nt() to
commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Move split_cmdli
n
e(
)
to alia
s
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los Vajna
p
ath-l
i
s
t document
a
tion: documen
t
a
l
l funct
i
ons and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajn
a
run-comm
a
nd documenta
t
ion: fix
"memset()" param
e
ter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajn
a
git-read-
t
ree: document -
v
opt
i
on
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple script to
p
arse the results
from the tes
t
cases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
g
it-rebase -i: mention the short command aliases in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
o
s
Vajna
Remove unused code in parse_commit_buffer(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Strbuf documentation
:
d
o
c
u
m
e
nt most fu
n
ctions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
M
iklos Vaj
n
a
R
e
vis
i
on walk
i
ng
documentati
o
n
:
document mo
s
t
i
mportant
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos
Vajna
Cod
i
ngG
u
idelines: Ad
d
a note
t
o avoid assignments
inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
gi
t
-merge: exclude
u
nneces
s
ary option
s
from OPTIONS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git-fast-import: rena
m
e cmd_*(
)
functi
o
ns to parse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
M
i
klos V
a
jna
INSTA
L
L: add a no
t
e
about GNU
i
nteractive tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos V
a
jna
Add tests f
o
r sende
m
ail
.
cc
c
onfiguration variab
l
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
ajna
git-send-email: add a ne
w
sendema
i
l
.
cc configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
o
s Vajna
git-f
o
r
mat-patc
h
:
add
a
new format
.
cc c
o
nfigur
a
t
ion
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git
c
h
eckout: ad
d
-
t
a
l
ias
for
-
-track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Mik
l
os
V
ajna
diff option
s
do
c
umentat
i
on
:
r
efer to --diff-
f
ilter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mikl
o
s Vajna
contrib/hooks: add an examp
l
e pre-auto
-
gc
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos
V
a
jna
Docu
m
entation/hooks: add pre-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajn
a
git-gc --
a
u
t
o: add pre-auto-g
c
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos V
a
j
na
Documentation/g
i
t-merge: documen
t
subtree strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Va
j
na
git-gui: Updated Hungarian trans
l
ation (e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos
Vajna
Update Hungarian tra
n
slation
.
10
0
%
co
m
pleted
.
commit
|
commitdiff
|
tree
2008-02-29
Mi
k
l
o
s Vajna
I
mprov
e
t6029 to check the real "
s
ubtree" case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos
V
ajna
Docum
e
ntati
o
n/git svn log: add
a
note about t
i
mezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos
Vajna
Docume
n
t
a
t
i
on/git-fi
l
ter-
b
r
a
nch: a
d
d a new msg-filt
e
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
next