repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
githooks documentation: add a note about the +x mode
2008-12-17
Miklos
V
ajna
g
i
thooks
documentation: add a note about t
h
e
+
x
m
ode
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-dae
m
on documentation: use {til
d
e}
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-07
Miklo
s
Vajna
http
.
c
:
use 'git_config_string' to get
'
curl_http_proxy
'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
M
i
kl
o
s Vajna
submod
u
le
:
use g
i
t rev-parse -q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
jna
r
e
b
ase:
u
se git rev-parse -
q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pull
:
use g
i
t rev-p
a
rse -q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Va
j
na
los
t
-found: use git rev-parse -q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vaj
n
a
fil
t
er
-
branch: use
git rev-parse -q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
git-stash: use git r
e
v-parse -q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-02
Mik
l
os Vajna
User's Man
u
al:
r
emove dupl
i
c
a
ted
u
rl a
t
the
end of
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-25
Miklos
V
aj
n
a
bu
i
l
tin_clone: u
s
e strbuf in cmd_clone()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
bu
i
ltin-clone: u
s
e
str
b
uf in c
l
one_local
(
)
a
n
d
c
o
py_o
r
_link_
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-25
Mi
k
los V
a
jna
builtin-clone:
u
se
s
trbuf in guess_dir_
n
ame()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-24
Mik
l
os
V
ajna
Add new testcase to
show fast-export
do
e
s n
o
t always
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
los
V
ajna
builtin-branch
:
use strbuf
i
n ren
a
me_branch()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Va
j
na
b
u
i
l
ti
n
-
branch: us
e
strbuf
i
n fi
l
l_tracking_inf
o
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
los Vajna
buil
t
in-branch: use st
r
buf in delete_branches(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
Update
Hunga
r
i
a
n trans
l
a
t
i
o
n
.
100% completed
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git
-
remote: document the migration
f
eatur
e
of the rename
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-12
Mi
k
los Vajna
g
i
t-rem
o
te rename: m
i
grate
from rem
o
tes/
and bra
n
ches
/
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-11
Miklo
s
Vaj
n
a
remote:
ad
d
a new 'ori
g
in'
va
r
iable to the st
r
u
ct
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
Impleme
n
t git remote r
e
name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajn
a
update-ref --no-deref -d: handle the
c
a
se
w
hen the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
git branch -m: fo
r
bid
renaming
o
f a symref
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix git update-ref --no-deref -
d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos Vajna
rename_ref(
)
: h
a
ndle
t
h
e case when the reflog of
a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vaj
n
a
Fix
g
it
b
ranch -m f
o
r
symrefs
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-19
M
ikl
o
s Vajn
a
pa
r
s
e-opt:
m
igrate bu
i
ltin-checko
u
t-index
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add testcase to ensu
r
e me
r
ging an e
a
r
l
y part
o
f a bra
n
ch
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
Miklos
V
ajna
Add Linu
x
P
PC support t
o
t
h
e pre-
a
uto
-
gc example
h
ook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-10
Miklos
Vajna
test-l
i
b:
f
ix color reset
i
n say_c
o
lor
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
Miklos
V
ajna
I
mplement g
i
t clone
-
v
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
Mik
l
os Vajna
Cle
a
nu
p
in sha
1
_file
.
c::c
a
che_or_u
n
pac
k
_entry
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
M
i
klo
s
Vajna
bu
i
ltin
-
c
o
mmit: use reduce_heads()
o
nly
w
hen appropri
a
te
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
Miklos
V
ajna
builtin-merg
e
:
refresh the index before cal
l
ing a strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7603: ad
d
n
ew te
s
t
cases to
e
nsure
builtin-commit uses
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
M
i
k
l
o
s
Vajn
a
bu
i
ltin-commit: use commit_tree(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
commit_tree():
add a new auth
o
r
p
ara
m
et
e
r
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos V
a
jna
t
7501: always use test_cmp instead of
d
iff
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
builtin-merge: release the
lock
f
i
l
e in
try_
m
erge_strategy()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vaj
n
a
m
e
rge-r
e
cursiv
e
: get rid of virt
u
al_id
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s
V
ajna
merge-recursive: move cur
r
ent_{file,directory}_set
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
M
iklo
s
Vajna
merge
-
r
e
cursive: move the gl
o
bal obuf to st
r
uct merge_optio
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s
Vajna
merge-recurs
i
ve:
g
e
t rid of the index_only globa
l
v
ariable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Miklo
s
V
ajna
mer
g
e
-
recursive: move ca
l
l
_depth to str
u
ct mer
g
e
_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos
V
ajna
Makefile: add m
e
r
g
e
_
recursive
.
h to LIB_H
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
cherr
y
-pick/revert:
make direct intern
a
l ca
l
l to merge
_
t
r
ee()
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
jna
bui
l
t
i
n
-
me
r
ge:
avoid run_command_
v
_opt() fo
r
recursive
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
jna
merge-recursive:
introduce m
e
r
ge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Vajna
Split out mer
g
e_
r
ecursive() to merge-recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Mik
l
os Vaj
n
a
M
ak
e
file
:
enab
l
e
SNPRINTF_R
E
TU
R
NS_BO
G
US for HP
-
UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
F
i
x '
g
i
t
h
elp help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos V
a
j
n
a
t9300
:
repla
c
e '!' with
t
est_must_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
D
oc
u
mentation: document the pag
e
r
.
*
configura
t
io
n
se
t
t
i
n
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
B
uiltin g
i
t-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
builtin-help: always load_command_list() in cm
d
_help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
Add a second testcase f
o
r handling invalid s
t
r
a
t
egies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Vajna
Add a new tes
t
for using a custom
merge strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vajna
built
i
n-merge:
a
l
l
ow
u
sing a custom strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
builtin-help: mak
e
some internal funct
i
ons avail
a
ble
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos
V
aj
n
a
t
7
601: ex
t
en
d
the 'merge
picks up the best resul
t
'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
M
ikl
o
s Vajna
builtin-me
r
ge: give a
proper
e
rror message
f
or invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'git
m
erge' that some merge s
t
rategies n
o
longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a new t
e
s
t for git-merg
e
-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos V
a
j
na
t6021:
add a new test
f
or git-
m
e
r
ge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make rem
o
ve-
d
ashes: apply
to scr
i
p
ts and progr
a
m
s as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git
-
bisect: use dash-l
e
s
s form
o
n git bise
c
t log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
t1007-hash-o
b
j
e
ct
.
sh
:
use quotes
for
the t
e
st descr
i
ption
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
ikl
o
s Vajna
t0001-init
.
sh:
c
hange confusing
d
i
r
ec
t
o
ry nam
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
M
iklos
V
a
jna
Bu
i
ld in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajna
Fix t7601-
m
erge-pull-conf
i
g
.
sh
o
n AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos
V
a
jna
git-commi
t
-
tr
e
e
: make it u
s
able from other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajn
a
A
d
d
new tes
t
case
to ensure git-
m
erge prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
hg-to-git: use gi
t
init ins
t
ead
of git init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-to-gi
t
: rewrite "git-frotz" to "git frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-
t
o-git: abort if the project
directory is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
iklo
s
Vaj
n
a
hg
-
to-git: av
o
id raising
a
string
e
xception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
INSTALL: U
p
d
a
te
s
ection a
b
o
u
t
g
i
t
-frotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
R
etire 'stu
p
i
d
' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
a
j
n
a
A
dd new
test ca
s
e to ensure git-merge reduces octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Add new test to ensure g
i
t-merge
handles more
t
han
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Introduce get
_
octopu
s
_merge_bases() in c
o
mm
i
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-
m
erg
e
-
m
sg: make
i
t u
s
able
f
rom ot
h
er builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Va
j
na
Move
read_cache
_
unmerge
d
()
to r
e
ad-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Ad
d
n
ew test to
e
nsure git-merge h
a
ndles
p
ul
l
.
twohea
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Move
p
ars
e
-o
p
tions's skip_pre
f
ix() to git-compat-uti
l
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vaj
n
a
Move commit_l
i
st_count() to com
m
it
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
a
j
na
Mo
v
e
s
plit
_
cmdline() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
i
klos Vajna
path
-
list doc
u
mentation: document all function
s
and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-command documentat
i
on: fix "memset()"
p
a
r
amete
r
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Mik
l
os Vajna
g
i
t-rea
d
-
tre
e
: d
o
cument -v o
p
ti
o
n
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os Va
j
na
A
simple sc
r
i
p
t
to parse the
r
e
s
ults from the testcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-reb
a
se -i:
men
t
ion the short command a
l
ias
e
s in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
Vajna
Remov
e
unused code in parse_com
m
it_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajn
a
S
trbuf docume
n
tation: document most functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
M
ikl
o
s
V
ajna
Revision wal
k
ing
d
ocum
e
ntation
:
d
o
cu
m
ent
m
ost
important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
CodingGuidelines:
Add a note to
a
vo
i
d assignmen
t
s inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
M
i
klos Vajna
git-merge: exclude unnec
e
s
s
a
r
y options f
r
om OPTI
O
NS_SPE
C
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Mikl
o
s Vajna
g
i
t-fast
-
im
p
ort:
r
ename cmd_*() function
s
to parse
_
*
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
M
iklos Vajna
INSTALL
:
add a note about GNU i
n
teract
i
ve tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
next