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
bisect: fix missing "exit"
2008-11-01
Miklos Vajna
update-ref
--no
-
deref -d: handle the case when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vaj
n
a
git bra
n
ch -m:
f
o
r
bi
d
renami
n
g o
f
a
symr
e
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos V
a
jn
a
Fix git update-ref --no-
d
eref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
re
n
ame_r
e
f():
h
a
ndle the c
a
se when the
reflog of
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajn
a
Fix git bran
c
h -m
for
symr
e
fs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
M
iklos Vajna
pa
r
se-opt: migrat
e
buil
t
i
n
-
checkout-i
n
d
e
x
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
i
klo
s
V
a
jna
A
d
d
testcase to ensure merging an early
p
art of a branc
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
ik
l
o
s
Va
j
n
a
Add Linux PPC sup
p
ort to the
pr
e
-auto-
g
c example ho
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Mikl
o
s
Vajna
test-lib
:
fix
c
ol
o
r reset in s
a
y
_
colo
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Implement git clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mi
k
los Vajna
Cleanup in sha1_
f
ile
.
c::cache_or_unpack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
built
i
n-commit:
use reduce_heads(
)
o
nly
wh
e
n
appropr
i
ate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
M
iklos Vajna
built
i
n-mer
g
e: refresh the
index before calling a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7603: add
new test
c
ases to ensur
e
builtin
-
c
o
m
m
i
t
u
s
es
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin-commit: use commit_t
r
ee()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
commit_tree(): add a
new aut
h
o
r parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
o
s Vajna
t7501: always use
t
est_cmp
instead o
f
diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos V
a
jna
builtin-merge: r
e
lease the lockfi
l
e in try_mer
g
e
_
stra
t
egy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursive: get rid o
f
virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Vajna
merge-recursive: m
o
ve c
u
rrent_{file,
d
irectory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vaj
n
a
merge-recursive
:
move the global
o
bu
f
to struct merge_o
p
tions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los
V
a
jna
m
e
rge-
r
e
cu
r
s
ive: ge
t
rid of the
i
nde
x
_only global variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos
V
a
j
n
a
merge-rec
u
rsive: move call_dep
t
h
to struct merge_opti
o
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos V
a
jna
Makefile
:
a
d
d
merge_recursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
ch
e
rry-pick/re
v
ert: mak
e
dire
c
t inter
n
al call to
merge_t
r
ee()
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Vajna
builti
n
-mer
g
e
:
avoi
d
run_comm
a
nd
_
v
_opt() fo
r
recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos Vajna
merge-recursive: int
r
oduc
e
m
erge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
o
s
Vajna
Split out merge_r
e
cursive() to
m
erge
-
recursiv
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos
V
ajna
Makefile: enable SNPR
I
NTF_RETURN
S
_BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
M
iklos V
a
jna
Fix 'git
h
elp help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t9300:
replace
'
!' with test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vaj
n
a
Docume
n
ta
t
ion
:
document
the p
a
g
e
r
.
* configur
a
tion s
e
tting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mi
k
los Vajna
Builti
n
git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
M
i
klos Vajn
a
builtin-help:
a
lways load_command_list()
in cmd_h
e
lp
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
Add a s
e
cond testc
a
se
for handling invalid strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
k
los Vajna
Add a
n
ew test for using
a
custom m
e
rge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Va
j
n
a
builtin-merge: all
o
w using a custom stra
t
egy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
n
a
b
u
iltin-help: make some inter
n
al fu
n
c
t
ions
a
v
ailable
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: extend t
h
e 'merge picks up t
h
e best
r
esult'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-mer
g
e
: give a pro
p
er error mess
a
g
e
for in
v
alid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'gi
t
merge' that some mer
g
e strategies
no
l
o
n
ger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a new tes
t
f
or g
i
t-merg
e
-reso
l
ve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a new te
s
t
f
or
g
it-
m
erge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s
Vajna
make r
e
move-dashes: apply to scripts
a
nd pro
g
rams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
g
it-bisect: use d
a
sh-less f
o
rm
on gi
t
b
i
sect
lo
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
t1007-hash-o
b
ject
.
sh: use quotes for the
t
est d
e
script
i
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajna
t
0001-init
.
sh: change confusing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
B
u
i
l
d in mer
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Vajna
Fix t7
6
0
1-merge-pull-confi
g
.
sh on
A
IX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos V
a
jna
git-commit-tree: make
i
t
usable
from o
t
h
e
r
builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
los Vajna
A
dd
n
ew test case
to
ensure g
i
t-merge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-gi
t
: use git i
n
i
t
i
n
stead of
g
it i
n
it-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
hg-to
-
git
:
rewrite "gi
t
-frotz" t
o
"
git f
r
otz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-to-git: abort if th
e
project di
r
ectory is no
t
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg-to-
g
i
t: avoid raisi
n
g a s
t
ring exc
e
ption
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
INSTALL: Update
s
ection about git-f
r
otz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retir
e
'stupid
'
merge strate
g
y
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Add new test case
to en
s
ure git-merge reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Ad
d
new test to
ensure
git
-
merge
h
a
n
dles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Intr
o
duce get_octopus_m
e
r
ge_
b
ases
(
) in co
m
m
i
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los
Va
j
na
git-f
m
t-merge-msg: mak
e
it usable from o
t
h
er builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Move read_cach
e
_unmerged() to re
a
d-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Add
n
ew test to
e
nsure git-merge ha
n
dl
e
s p
u
ll
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
M
o
ve parse
-
options'
s
s
k
ip_prefix()
t
o git-compat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Move com
m
it_list_count() to commi
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
M
o
ve
split_c
m
d
line() to alia
s
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
pa
t
h
-list
d
ocumentation: d
o
c
u
ment
all fun
c
t
i
ons and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
run-com
m
and documentation: f
i
x "memset()" pa
r
am
e
t
er
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklo
s
Vajn
a
git-rea
d
-tree: document
-v opti
o
n
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
Va
j
na
A simpl
e
script to
p
arse the results
f
rom
t
he
t
estcase
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
aj
n
a
git-rebase -i
:
mention t
h
e
s
hort
c
o
mmand alia
s
es in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remove unused c
o
de i
n
parse_commit_buffer(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
S
t
rbuf do
c
umentation: documen
t
mos
t
functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
R
evis
i
o
n
walking documentation:
d
ocument m
o
st important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos
V
ajna
C
o
d
i
n
gGu
i
delines: A
d
d
a note
t
o avoid assignmen
t
s inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mikl
o
s V
a
jna
g
i
t-m
e
rge: exclude unnecessary opti
o
ns fr
o
m OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos
V
a
jn
a
git-fa
s
t-import: rename cmd_*
(
) functions to parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos
V
ajna
INST
A
LL: add a note about
GNU interactive tools ha
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add tests
f
or s
e
n
d
email
.
cc co
n
fig
u
r
ation v
a
riable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-send-email: add a new sendema
i
l
.
c
c con
f
iguration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os
V
ajna
git-format-patch:
add a new
format
.
cc
co
n
figura
t
i
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
gi
t
checkout: add
-t alias for --
t
r
a
ck
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mik
l
os Vajna
di
f
f
o
ption
s
docu
m
e
n
tation: refer t
o
--diff-fil
t
er
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Vaj
n
a
contrib/h
o
oks: add
a
n exa
m
p
le pre-a
u
to-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Va
j
na
Doc
u
m
entation/hooks: add pre-aut
o
-g
c
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os V
a
jna
git-gc --a
u
t
o
: add pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
M
i
klos Vajna
D
o
c
u
men
t
atio
n
/git-merge: d
o
cument sub
t
re
e
strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos
V
a
j
na
git-gui
:
Updated Hungarian
translation
(
e
5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Update Hungarian tr
a
n
s
l
ation
.
1
0
0% comple
t
ed
.
commit
|
commitdiff
|
tree
2008-02-29
Mi
k
l
os Vajna
Improve t6029 t
o
check t
h
e r
e
al
"
subtree
"
cas
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
M
iklos Vajn
a
Documentati
o
n/git
svn log: ad
d
a note about timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
D
o
c
umentation/git-f
i
l
ter-bra
n
ch: add a new
m
sg
-
filte
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Mi
k
los Vajna
git-clean: handle errors if
r
e
m
oving files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Mikl
o
s
Vajna
Documen
t
ati
o
n/git-stas
h
: documen
t
options for git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos
V
ajna
git clon
e
-s docum
e
ntation:
f
orce a ne
w
paragraph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos V
a
jna
buil
t
i
n
-
gc
.
c: guard config pa
r
s
er from val
u
e=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos
Vaj
n
a
git rev-pars
e
manpage: spelling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
M
i
klos Vajn
a
git pull manpa
g
e: d
o
n
'
t i
n
clude -n from
fetch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-cl
o
ne -
s
: d
o
c
ument problems w
i
th
g
it gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos
V
ajna
Inc
l
ude re
v
-list options in git-log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next