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
Mikl
o
s Vajna
remote: add
a
new 'origin
'
vari
a
b
l
e to
the struct
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-05
Miklo
s
Vajna
Implement git
r
emot
e
rename
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-01
Mik
l
os Vajna
upda
t
e-
r
ef --no-der
e
f -d: handle the case when
the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-30
Mik
l
os Vaj
n
a
git branch -m: fo
r
b
i
d
renamin
g
of a
symref
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix gi
t
upd
a
te-ref --no-dere
f
-d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
rename_re
f
(
)
: handle the case
w
hen the reflog of a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
Vajna
Fix
g
i
t branc
h
-m
for symrefs
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-19
Miklos
V
a
j
n
a
parse-opt:
migrate builtin-check
o
ut-index
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add t
e
stcase to en
s
ure m
e
rgi
n
g an
early part of a bran
c
h
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
A
dd
L
inux
PPC support to the
pre-auto
-
gc
e
xample hoo
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-10
Mik
l
os Vajna
tes
t
-lib: f
i
x color r
e
set
i
n say
_
color()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
Miklos V
a
j
n
a
Implement g
i
t clone
-
v
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
Miklos
Vajna
Cleanup in sh
a
1_f
i
le
.
c:
:
cache_or_unpack_entry()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
bu
i
ltin
-
commit: use r
e
duce_heads(
)
only w
h
en a
p
p
ropriate
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-merge
:
re
f
resh the
i
ndex before c
a
lling a strateg
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Va
j
n
a
t7
6
03
:
add new testcases to en
s
ure builtin-commit uses
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajna
bui
l
tin-commit: use commit_tree()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
M
ikl
o
s
Vajna
comm
i
t
_
tree(): add
a
n
ew author parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
os Vajna
t75
0
1: always us
e
test_c
m
p
i
n
s
tead of diff
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
builtin
-
me
r
g
e
:
release the lockf
i
le in
t
ry_merge_strategy()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
V
ajna
m
e
rge-recursive: get rid of vi
r
tua
l
_id
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos V
a
j
n
a
merge-recursiv
e
: move curren
t
_{fi
l
e,dire
c
tory}_set
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
V
ajna
merge
-
recursi
v
e:
m
ov
e
the global o
b
u
f to struct merge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursive:
get rid of the index
_
only g
l
o
b
a
l
va
r
iable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
merge-recursive: mo
v
e call
_
d
epth
to struct me
r
ge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Makefile: add merge_recurs
i
ve
.
h t
o
LIB
_
H
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vaj
n
a
cherry-pick/revert:
make direct internal call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-merge: avoid run_command
_
v_opt() for recursive
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Vajna
merge-recursive: intr
o
duce merge
_
option
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajn
a
Sp
l
it out
merge
_
recursi
v
e
(
)
t
o merge-
r
ecursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Mi
k
l
os Vajna
Makefi
l
e
: enab
l
e
S
NPRINTF
_
RET
U
RNS_B
O
GU
S
for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
M
i
k
los Va
j
n
a
F
i
x 'git help help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Va
j
na
t9300:
replace '!
'
with test_must_fai
l
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
M
i
klos Vajna
Documentation: docum
e
nt the pag
e
r
.
* confi
g
urati
o
n setting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
B
u
iltin git-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
builtin-help: always l
o
ad
_
comm
a
nd_li
s
t() i
n
cmd_help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a second test
c
ase f
o
r ha
n
d
lin
g
i
n
valid strategi
e
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los
Vajna
Add a new te
s
t
for using a
custom merge s
t
ra
t
e
g
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
bui
l
t
in-
m
erge:
a
llow us
i
ng a cus
t
o
m strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-help: make
some internal functions a
v
ailable
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t760
1
: exte
n
d
the
'
m
e
rge pick
s
up
t
he best re
s
u
l
t
'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge: give a proper error messa
g
e for invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
lo
s
Vaj
n
a
Teach 'git
m
erge' that some mer
g
e strate
g
ie
s
no long
e
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
M
i
kl
o
s Vajna
A
dd
a new test fo
r
git-mer
g
e-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021:
add a new test for git-
m
erge-reso
l
ve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
m
a
k
e
remove
-
dashes: app
l
y to
script
s
and programs as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
gi
t
-bise
c
t:
u
se dash-less
fo
r
m
o
n gi
t
bisect
l
o
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos
V
aj
n
a
t100
7
-hash-o
b
ject
.
sh: use q
u
otes
f
or th
e
test description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
0001-init
.
sh: change confu
s
i
ng directory name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Mikl
o
s Vajna
Build
i
n
mer
g
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
ikl
o
s Vajna
Fix
t
7601-me
r
ge-pull-config
.
sh on
AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
g
it-commit-tree: make it us
a
ble from other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Ad
d
new te
s
t case t
o
ensure
g
it-merge prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
hg-
t
o
-g
i
t:
use git ini
t
in
s
tead of git i
n
it-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg-to-git: rewrite "
g
i
t
-fro
t
z"
to "
g
it fr
o
tz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
h
g
-
to-git: abor
t
if the project directo
r
y
i
s not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg-to-gi
t
: avoid raisi
n
g
a
string exce
p
tion
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajn
a
INSTA
L
L
: U
p
dat
e
se
c
tion
a
bou
t
git-frotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
M
i
k
los Vajna
Retire 'stu
p
id' m
e
r
g
e strate
g
y
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los
Vajna
A
dd
new test case t
o
ensure
git-merge red
u
ce
s
oct
o
pu
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
n
ew test to ensure git-merge
handles more than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Intr
o
duce get_octopus
_
m
erge_bases
(
) in comm
i
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git
-
fmt
-
m
e
rge-msg: make it us
a
ble from o
t
her builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
ve read_c
a
che_
u
nmerged(
)
to read-c
a
che
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
lo
s
Vajna
Add new test
t
o ensure git-mer
g
e handles p
u
ll
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Move
p
arse-options's
skip_prefi
x
()
to git-co
m
pat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
ove c
o
mm
i
t_list_count() to commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Mo
v
e sp
l
it_cmdli
n
e() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
path-list
d
ocumentation:
docume
n
t all funct
i
o
ns and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Mik
l
os Vaj
n
a
run-command documentation: f
i
x "memset
(
)" paramet
e
r
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vaj
n
a
g
it-read-tre
e
: document -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos
V
ajna
A simp
l
e script to
parse the results from
t
he te
s
tc
a
ses
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
l
o
s Vajna
git-rebase -i:
mention the short c
o
mman
d
aliases in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s
Vajna
Remove un
u
sed code in parse_
c
ommit_buffer(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos
V
ajna
Strbuf doc
u
mentation:
document most fun
c
tions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos V
a
jna
Re
v
is
i
o
n
wal
k
i
n
g
d
ocumen
t
ation:
d
ocument most
impo
r
tant
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
M
i
klos
Vajna
Coding
G
uide
l
in
e
s: Add a note to avoid assignment
s
inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Mi
k
l
o
s
Vajna
git-merge: ex
c
lude unnecessary options from OPTION
S
_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos V
a
j
n
a
git-fast-import: rename
cmd_*() functions
to pa
r
se_
*
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Mikl
o
s Vajna
IN
S
TALL: add a note abou
t
G
NU
inter
a
c
t
iv
e
tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mikl
o
s Vajna
Add te
s
ts for se
n
de
m
ail
.
cc co
n
figur
a
tion variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajn
a
git-se
n
d-ema
i
l: add a new
s
e
n
de
m
ail
.
cc
c
o
nfiguration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
ikl
o
s
V
a
jna
git-format-patch: add
a ne
w
format
.
c
c
configurat
i
o
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git checkout: add -t
a
l
i
as for --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklo
s
Vajna
di
f
f op
t
ions do
c
u
mentation: refer to --di
f
f-
f
ilter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klo
s
Vajna
contr
i
b
/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
M
i
klos
V
ajna
Docum
e
ntation/hooks: add pre
-
aut
o
-
g
c hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
i
kl
o
s V
a
j
n
a
g
i
t-gc --auto: add pre
-
auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Mik
l
os Va
j
na
D
o
cumentation/git-merge:
document subtree strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Mik
l
os Vajna
git-gui: Up
d
ated Hungarian transl
a
tion (e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
M
iklos Vajna
Upd
a
te
H
ungarian
translation
.
100% complete
d
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos
V
ajna
Improve t602
9
to check
t
he real "su
b
tree"
c
a
se
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
M
i
klos Va
j
na
Documentation/gi
t
svn log:
a
dd a note about timez
o
nes
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos
V
ajna
Do
c
u
menta
t
ion/git-filter-b
r
anch: ad
d
a new
msg-f
i
l
ter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Mikl
o
s Vajna
git-clean: ha
n
dle
e
rrors if removing
f
iles fa
i
ls
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Documen
t
ation/
g
it
-
s
tash:
d
ocument options for git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajn
a
git clone -s
d
o
cumentation: force
a n
e
w pa
r
agr
a
ph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
M
i
klos
Vajna
buil
t
in-gc
.
c
: gu
a
rd
c
onfig parser from
v
a
lue=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklo
s
Va
j
na
git rev
-
parse man
p
age: s
p
e
lli
n
g fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos
V
ajna
git pul
l
manpage:
d
on't include -n from
fetch-opti
o
ns
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
next