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
remote: add a new 'origin' variable to the struct
2008-11-11
M
iklos Va
j
na
rem
o
te: a
d
d a new 'origin' variab
l
e
to
the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
M
i
k
los Vajna
Imple
m
ent
git remote r
e
n
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
M
iklos Vajna
update-ref
-
-n
o
-deref -d: h
a
ndle the
case when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Mi
k
lo
s
Vajna
git branch
-
m
:
f
or
b
id re
n
aming
of
a
symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
ikl
o
s
Vajna
Fix git update
-
ref --no-dere
f
-
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos V
a
jna
rename_ref
(
)
:
handle the case when the
r
efl
o
g of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
ik
l
os Vajna
Fix git branch -m for symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklo
s
Vajna
pa
r
se-opt: migra
t
e builtin-checkout-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mikl
o
s Vajna
A
dd te
s
tc
a
se to ensure mergi
n
g an early part o
f
a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos
V
a
jna
Add Lin
u
x PP
C
support to
t
he pre-a
u
t
o
-gc example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
te
s
t-lib: fix
color reset in sa
y
_colo
r
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
klos Va
j
na
Implement g
i
t clone -
v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mik
l
os
V
ajna
Clea
n
up in sha1_
f
ile
.
c::cache_or_unpack_entry
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
M
iklos Vajna
builti
n
-c
o
mmit: use re
d
uce_h
e
ads()
only when appropri
a
te
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mi
k
l
o
s
V
ajna
builtin-merge: refresh the index
b
e
fo
r
e c
a
lling a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
k
los Vajna
t760
3
:
add new testcases to ensure
bu
i
ltin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
b
u
ilt
i
n
-
c
o
m
m
i
t
: use commit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klo
s
Vajna
commit_tree():
add a
new author param
e
ter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vaj
n
a
t75
0
1
:
alw
a
ys use
tes
t
_cmp
i
nst
e
ad of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos V
a
jna
bu
i
l
tin-merge: rel
e
ase the loc
k
file in t
r
y_merge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursi
v
e
: get rid of virtual
_
i
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-rec
u
rsi
v
e:
m
ove curre
n
t_{file,director
y
}
_
set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge
-
recu
r
sive: move the global obu
f
to struct
merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los Vajna
merge-recurs
i
ve: get
r
id of the in
d
ex_onl
y
global
v
ari
a
ble
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
merge-re
c
ursive:
move c
a
ll_depth
t
o struct merge_optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
k
l
os
Vaj
n
a
Make
f
ile: ad
d
merge_recur
s
ive
.
h to
L
IB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mi
k
l
os
V
a
jna
che
r
ry-pick/rev
e
rt:
make direct internal cal
l
to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajn
a
b
u
iltin-
m
erge: avoid r
u
n
_comman
d
_v_opt() for rec
u
r
sive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
m
e
rge-
r
ecursi
v
e: introdu
c
e merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Va
j
na
Sp
l
it out merge_recu
r
s
i
ve() to
m
erge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos V
a
j
na
M
a
ke
f
ile: enable SNPRINT
F
_RETURNS_B
O
GU
S
for
HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'git h
e
l
p
help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos V
a
j
n
a
t9300: replace '!
'
with test_must_
f
a
i
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mi
k
los Vajna
D
ocumentation: d
o
c
u
m
e
nt th
e
pager
.
* config
u
ration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos
Vajna
B
uiltin git-h
e
lp
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos V
a
jna
buil
t
in-help: al
w
ays lo
a
d_comm
a
nd_list() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
A
dd a se
c
ond testcase for handling invalid str
a
tegies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajna
Add a new test for u
s
ing a cus
t
om m
e
rge strate
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-merg
e
: allow us
i
ng
a c
u
s
t
o
m strate
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
a
jna
builtin-help
:
make
some internal fu
n
ctions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos
V
ajna
t7601:
e
xt
e
nd the 'merge picks up the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklo
s
Vajna
builtin-merge: give a pr
o
per error messa
g
e
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
merge strategies no longe
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
os Vajna
Ad
d
a n
e
w
t
est for
g
it-me
r
ge-resolv
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vaj
n
a
t
6
0
21:
a
dd a new test f
o
r git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
o
s Vajna
make r
e
move-dashes: appl
y
t
o scripts a
n
d programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
git-bisect: use da
s
h-l
e
ss
f
orm on git
bis
e
ct log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t10
0
7-hash-object
.
s
h
: use quotes f
o
r the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vajna
t0001-init
.
sh: change con
f
using
d
i
rectory na
m
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
i
k
l
os Va
j
n
a
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Vajna
Fix
t7601-merge
-
pull-confi
g
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vaj
n
a
git-commit-
t
r
ee: make
i
t usable from other b
u
ilti
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new test
c
a
se to
e
nsure git-mer
g
e prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajn
a
hg-to-git
:
use gi
t
init inst
e
ad of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos
V
aj
n
a
hg-to-git: rewrite "git-frotz
"
to "git f
r
otz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos
Vaj
n
a
hg-to-git
:
abort if
t
he proj
e
ct d
i
rectory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git
:
av
o
id
r
aising
a string e
x
c
e
ption
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
I
N
STALL: Update
sectio
n
about
g
i
t-
f
r
otz f
o
rm
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
ik
l
os
Vajn
a
Ret
i
re 'st
u
p
i
d' m
e
rge strategy
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los
Vajna
A
dd new
t
est c
a
se
t
o ens
u
re git-merge reduc
e
s o
c
topus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test
to ensure git-merge handles mor
e
than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduc
e
ge
t
_octopus_merge_base
s
()
in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os
Vajna
git-fmt-merge-msg:
m
ake
it usable from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os V
a
jna
Mo
v
e read_cache_unmerged() to read
-
cach
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Add new tes
t
to ensure git-merg
e
h
a
n
dles pull
.
t
wohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Move parse-options's skip_prefi
x
() to git-compat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move commit_list_count(
)
to
c
ommi
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move sp
l
i
t_cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
i
klos Vajna
path-
l
ist docume
n
t
a
tion: document
a
ll functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
Vajna
run-comm
a
nd docu
m
e
n
t
a
tion: fix "me
m
set()" par
a
mete
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read-tree: document -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple s
c
ript
to
parse the
results from the
t
e
stcase
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-rebase -
i
: mention the short
command aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Va
j
na
Remove unused code i
n
parse_comm
i
t_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
iklos Vajna
S
t
rbuf
d
ocumentation:
d
ocum
e
nt most func
t
ions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos
V
ajna
R
evisio
n
walking documen
t
at
i
on: docume
n
t most important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
M
i
k
l
os
V
aj
n
a
C
o
ding
G
ui
d
e
l
ines: Add a no
t
e to
a
v
oid assignme
n
ts
inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos
V
ajna
git-me
r
ge: e
x
clude unneces
s
ary opt
i
ons from OPTIONS
_
SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
iklos Vajna
git-fa
s
t-
i
mpo
r
t: r
e
name cmd_*() function
s
t
o parse_*
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL:
a
d
d a no
t
e abo
u
t
GNU interactive too
l
s has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos
V
a
j
na
Add t
e
sts fo
r
sendemail
.
cc
configuratio
n
variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
gi
t
-
s
end
-
email:
add a new sendemail
.
cc configur
a
tion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
ajna
git-format-pa
t
ch: add
a
n
ew fo
r
m
a
t
.
cc conf
i
gurat
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git checko
u
t: add -t
a
lias for
-
-
track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
diff opt
i
ons document
a
t
i
o
n: re
f
e
r
to --diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
contrib/hooks: add an example pre-au
t
o-
g
c
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Documentation
/
h
o
oks: add pr
e
-au
t
o-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git-gc --auto:
a
dd pre
-
auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Mik
l
o
s Vajna
D
o
cumentat
i
o
n/git-me
r
ge: document
s
ubtree s
t
r
ategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
g
i
t-g
u
i: Up
d
ated
H
ungarian translation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Update Hungarian translat
i
on
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Improve t
6
029
to
c
h
ec
k
the real "subtree"
case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
M
i
k
los V
a
j
n
a
Docum
e
n
tation/
g
it svn l
o
g: add a note about timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos
V
ajna
Docum
e
ntation/git-filt
e
r-branch: add a new msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clean: handle errors if r
e
mov
i
ng files fa
i
ls
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Va
j
na
Docum
e
ntation/gi
t
-st
a
sh:
d
o
c
ument opt
i
on
s
for git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos
V
ajna
git clon
e
-s d
o
cumentation: forc
e
a new para
g
raph
f
or
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
ikl
o
s Vajna
builtin-gc
.
c
:
guard
conf
i
g
parser from
v
alue
=
NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git re
v
-pars
e
manpage: spelling
f
i
x
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Mi
k
los Vaj
n
a
git pull ma
n
page: don't incl
u
d
e
-n
f
rom fetch-opt
i
ons
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next