repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-base --octopus to mimic show-branch --merge-base
2010-07-13
Mik
l
os Vaj
n
a
format-pa
t
ch: doc
u
m
ent
t
he for
m
at
.
to confi
g
u
r
ation
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
Miklos Vajna
r
e
quest
-
pull
:
avoid mentioning that t
h
e
start point
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
Mi
k
los Vajna
gitk: Upda
t
e
Hun
g
arian tran
s
latio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
M
iklos Vaj
n
a
D
o
c
ument date
f
o
r
mats acce
p
ted by parse_date()
commit
|
commitdiff
|
tree
2009-12-03
Miklos Vajna
builtin-
c
omm
i
t: add
-
-
date option
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
Miklos Vajn
a
git-stash documentat
i
on:
me
n
tion defaul
t
op
t
ions for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
Miklos Vajna
git branch -D: give a bette
r
error message when lockfile
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
M
i
k
los Vajna
g
i
t-clone: add missing comma in --reference documentation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Mik
l
os Vajna
hg
-
to-git
:
d
o
n't
impor
t
t
h
e
unused popen2 module
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
M
iklo
s
Vajna
git-submodule doc
u
men
t
ati
o
n: fix foreach
example
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Mi
k
lo
s
Vajna
g
i
t-svn docume
n
tati
o
n: fix typo in 'rebase vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
o
s
Vajna
refs: use warning() instea
d
of fp
r
i
n
tf(s
t
derr,
"
w
a
rning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
b
u
iltin-show
-
ref
:
use
w
a
rnin
g
() instead of
f
printf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-sho
w
-b
r
anch:
u
se warning() i
n
stead of
fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
bui
l
ti
n
-rm: use warning()
i
nst
e
ad of fpr
i
ntf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklo
s
V
ajna
builti
n
-init-db: us
e
warni
n
g
(
) instead of fprintf(stderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
aj
n
a
builtin-fetc
h
-pack:
use warning() i
n
stead o
f
f
p
rintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-checkout: use
w
arning()
instead of
f
p
rintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
ik
l
os Vaj
n
a
bu
i
ltin-apply:
u
se w
a
rning()
inste
a
d
of fprint
f
(
s
t
derr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vaj
n
a
http-p
u
sh: usi
n
g
erro
r
(
) a
n
d warning() as appropri
a
te
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos Vajna
Tests: use test_
c
mp instead of
d
iff w
h
ere possible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Mikl
o
s Vajna
parse-opt:
m
i
g
r
a
te
builtin-ls-files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
M
i
klos
V
ajna
gittutorial: remov
e
misle
a
ding note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos Vajna
Make t34
1
1 exe
c
utable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Mik
l
os Vaj
n
a
fast
-
export: print usage wh
e
n
n
o opti
o
ns specif
i
ed
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Vajna
parse-opt: migrate builtin-a
p
ply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklo
s
Vajna
t9129
:
ski
p
the l
a
st three
t
ests if UTF
-
8 locale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Mi
k
lo
s
Vajna
S
u
bmi
t
tingPatch
e
s: mention the usage of real
n
ame
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mi
k
l
o
s
Vajna
githooks
d
ocum
e
ntation: add a
n
ote about th
e
+x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-daemon document
a
t
i
on: use
{
t
i
lde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
M
iklos
V
ajna
Add
s
upport
f
o
r
a
pdf version of
t
he u
s
er manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Va
j
na
git-gui:
Update Hung
a
rian tr
a
nslatio
n
for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
htt
p
.
c: use 'g
i
t_confi
g
_string' to
g
et 'curl_
h
ttp_p
r
oxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
s
ubmodule: us
e
git
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajn
a
rebase: use git rev
-
parse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
pull: use g
i
t rev-pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
V
a
jna
l
ost-
f
ound:
use
git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
iklos
V
ajna
filter-branc
h
:
u
s
e git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
git-stash
:
use git r
e
v-
p
arse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vajna
User's Manual: remove
d
u
plicated url at the end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mikl
o
s
V
ajna
builtin_c
l
on
e
: use strbuf in cmd_cl
o
n
e
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
b
u
i
ltin-
c
l
o
n
e
: use strbuf in clone_local() and copy_
o
r
_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajn
a
built
i
n
-
clone: us
e
strbuf
i
n
guess_dir_name(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos
Vajna
Add n
e
w
te
s
tcase t
o
show fast-export doe
s
not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Va
j
na
built
i
n-branch: use s
t
rbuf in rename_
b
r
a
n
c
h()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os Vaj
n
a
b
uiltin-branch: us
e
st
r
buf in fill
_
tracking_inf
o
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajn
a
builtin-branch: use
s
trbuf in delete
_
branche
s
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os Vajna
Update Hu
n
garian translation
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklo
s
Vajna
git-remote: do
c
ument the
m
igration
feature
of the ren
a
me
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mik
l
os Vajna
git-remote rename: m
i
grate from re
m
otes/ and
branche
s
/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Mik
l
os Vajna
remote: add a
new
'origin' variab
l
e to the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
M
iklos Vajna
Implement git
r
emote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajna
upda
t
e-
r
e
f
--no-deref -d:
h
a
ndle
the ca
s
e when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Mi
k
los Vaj
n
a
gi
t
b
r
anch -m: forbid renaming of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
V
ajn
a
F
i
x git
u
pdate-r
e
f --no-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vaj
n
a
rename_ref(): han
d
le the case whe
n
the
r
eflog of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix
g
i
t
branch -m for symre
f
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
parse-
o
p
t
:
m
igrate built
i
n-checkout-
i
ndex
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add testcase to ensure merging an early part
o
f a bran
c
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos
Vajna
Ad
d
Linu
x
PPC support to the pre-auto
-
gc ex
a
mple
h
oo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos V
a
j
n
a
test-lib: fix color r
e
set in say_col
o
r()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos
Va
j
na
Implement gi
t
clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Cleanup
i
n sha1_file
.
c::cache_or_unpack_e
n
try(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mik
l
os Va
j
na
buil
t
i
n-co
m
mit
:
use r
e
duce_heads() only
w
hen
appropria
t
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mik
l
os Vajna
builtin-me
r
ge
:
r
efresh
t
h
e i
n
dex
b
efore
c
a
llin
g
a str
a
tegy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
V
a
jna
t7603: add new test
c
ases
to
e
ns
u
re builtin
-
commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin-commit: use commit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
k
los Vajna
c
ommit
_
tree()
:
add
a
new a
u
t
h
or p
a
ram
e
ter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajna
t7501: a
l
ways use test_cmp instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Mi
k
l
o
s Vaj
n
a
bui
l
tin-merge:
r
elease the
l
o
c
kfile in tr
y
_merge_strate
g
y
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos V
a
jna
mer
g
e-recur
s
ive: get rid of virtua
l
_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklo
s
Vajna
merg
e
-
r
ecursiv
e
: move current_{file
,
directory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajn
a
merge-recursive: move t
h
e global obuf to struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Va
j
na
merge-recursive: g
e
t rid of th
e
index_only global v
a
riabl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Mi
k
l
o
s Vajna
m
e
rge-rec
u
rsive: move call_d
e
pth to struct merge_
o
ptions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos
Vajna
Makefile: add merge_recursive
.
h
to LIB_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vaj
n
a
che
r
ry-pick
/
reve
r
t
: make direct internal call to merge_tree
(
)
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s Vajna
builtin-merge: avo
i
d run_comman
d
_v_
o
p
t
() for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
j
na
merg
e
-
recursive: i
n
troduc
e
m
e
r
g
e_option
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Spli
t
out
me
r
g
e_recursive(
)
to merge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefi
l
e: enable SN
P
RIN
T
F_RET
U
R
N
S_BO
G
US for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
V
ajn
a
Fix 'git
h
e
lp hel
p
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
Vaj
n
a
t930
0
:
r
eplace
'
!' with test_must_
f
ail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mi
k
los V
a
jna
Documentation
:
d
o
cument the pager
.
* configu
r
ation
setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklo
s
V
a
jna
Bui
l
tin git-hel
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
M
i
kl
o
s Vajna
builtin-help
:
always load_com
m
and_list() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jn
a
Ad
d
a second test
c
ase for hand
l
ing invali
d
stra
t
eg
i
es
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos 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 Vajna
b
u
iltin-merge:
allow using a
c
ustom
st
r
ateg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
builtin-
h
elp: mak
e
some i
n
terna
l
functions av
a
ilable
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
i
klos Va
j
n
a
t7
6
01:
extend the 'merge pick
s
u
p
t
h
e bes
t
res
u
lt'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajn
a
built
i
n
-
merg
e
: give a
pro
p
er error message f
o
r invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'git merge' that some me
r
ge
s
trategies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos V
a
j
n
a
Add a new test for git-merg
e
-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t
6
02
1
:
a
d
d a new tes
t
f
o
r gi
t
-m
e
rge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vaj
n
a
mak
e
r
e
move-da
s
hes: apply to
scripts and
p
rograms
a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
g
i
t-bisect:
u
se dash-less form on git
b
isect
l
og
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
t1007-hash-o
b
ject
.
s
h
: use q
u
otes for the test des
c
ri
p
t
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
t0001-init
.
sh: change co
n
f
u
sing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
i
klos Vajna
Buil
d
in
merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next