repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: get rid of the index_only global variable
2008-09-05
Mik
l
os Vajna
m
erge-recursive: get rid of th
e
ind
e
x_only global v
a
r
ia
b
l
e
commit
|
commitdiff
|
tree
2008-09-04
Mikl
o
s Vajna
merge
-
recursive: move call_depth to struct m
e
rge_options
commit
|
commitdiff
|
tree
2008-09-03
Mi
k
lo
s
Vajna
c
herry-p
i
ck/r
e
vert: make direct internal
c
all to merge_tree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s
V
a
j
na
bui
l
tin-merge: avoid run_command_v_o
p
t
() for recur
s
ive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
mer
g
e-recursive:
introduce
merge_
o
ption
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Stephan Beyer
merge-re
c
ur
s
i
ve
.
c: Add
m
ore generic me
r
ge_recursiv
e
_generi
c
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s
V
a
jn
a
Spli
t
out merge_recursive(
)
t
o merg
e
-
recursive
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
ama
n
o
Me
r
ge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Haman
o
g
itattributes: -crlf is not bi
n
ary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ham
a
no
g
it-
a
pply: Loosen "match_beginning" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C H
a
m
ano
Fix exampl
e
in git
-
name-rev do
c
ume
n
tatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge bran
c
h 'sp/missing-thin-base' into maint
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
M
e
rge bra
n
ch 'sb/daemon'
commit
|
commitdiff
|
tree
2008-08-30
Junio C
Hamano
M
e
r
g
e bra
n
ch 'af
/
main
t
-ins
t
a
l
l-no-handl
i
nk'
i
n
to maint
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
sh
e
ll:
do not play dupli
c
ate
d
defi
n
i
t
ion ga
m
e
s t
o
s
h
rink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
A
lex
R
ies
e
n
Fix u
s
e of
h
ardlin
k
s in "make in
s
t
a
ll"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge branch 'np/
v
eri
f
y
-pack' into
maint
commit
|
commitdiff
|
tree
2008-08-29
J
u
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-29
T
o
r
Arvid L
u
n
d
git-p4: Fi
x
checkou
t
bug when using -
-
impo
r
t-loc
a
l
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
P
aolo
C
iarrocchi
tuto
r
ial: gentle
r
illustration of Alice
/
Bob
w
orkflow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Jeff K
i
ng
p
r
ett
y
=for
m
at: respect date f
o
rm
a
t options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo
B
onzini
make git-shell
p
aranoid about c
l
osed std
i
n/stdout/stderr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Yann
Dirson
Document gitk --argscmd
f
la
g
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Li
n
us Torval
d
s
Fix '--
d
irs
t
at' with cross-director
y
renam
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Björn Steinbri
n
k
for-each-ref: A
l
low a trai
l
ing slash i
n
the patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
A
l
e
x Ries
e
n
list_commands:
only
c
all git
_
exec_pa
t
h i
f
it is needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Allow git he
l
p work w
i
thout PATH se
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
A
lex Riesen
Make ma
i
n_cmds
and other_cmds local
to
b
u
i
ltin-help
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex R
i
esen
Remove useless
m
emset of s
t
a
t
i
c command name lists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Al
e
x Riesen
Remove calculation
of t
h
e lo
n
gest c
o
mmand name from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Bra
n
don C
a
se
y
dir
.
c: Avo
i
d c99
array in
i
t
i
alization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
M
atthias Keste
n
holz
bash-c
o
mpletion: Ad
d
all
s
ub
m
o
d
ul
e
subcommands to
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-28
Junio
C
Hamano
Merge branch 'mv
/
merge-custom'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Hamano
Merge branch 'ml
/
submodule'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
i
o
C Hamano
Merge branch 'am/
c
h
erry-
p
ick-rerere'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o C Hama
n
o
Merge branch 'jc/add
-
add
r
emove'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Me
r
ge
b
ranch 'n
p
/v
e
rify-pack'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C
Hama
n
o
Merge branch
'
da/submodule-sync'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C
Hamano
Merge
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
ct
y
pe
.
c: protect tiny
C prepr
o
c
e
ssor constants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
L
i
nus T
o
rvalds
ind
e
x-pack: be car
e
ful
after fixing
up the head
e
r/footer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Simon H
a
usmann
Make it pos
s
ibl
e
to abor
t
the s
u
bmi
s
sion of
a chan
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ha
m
a
n
o
Merge branch 'af/maint-install-no-handlink'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
H
a
m
ano
Merge b
r
anch 'jc/no-
s
lim-shell'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Me
r
ge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-27
Jeff King
format-p
a
tch: use default
diff
format even with patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Nguyễn
T
hái Ngọc Duy
index-pac
k
: setup g
i
t re
p
ositor
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Rams
a
y Jones
Sup
p
r
e
ss
s
o
me bash r
e
direction error mes
s
ages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsa
y
Jones
F
i
x
a war
n
i
ng (on cygwin) to allow -Werror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Andreas Färber
Make
f
ile:
a
lways provi
d
e a fallback when hardli
n
k
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
J
u
n
io C
Hamano
daemon
.
c: m
i
nor st
y
le fixup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
D
avid
A
g
ui
l
ar
g
it-submodu
l
e: add "
s
ync" command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio
C Hamano
Revert "Build-in "git-s
h
ell""
commit
|
commitdiff
|
tree
2008-08-25
Jeff K
i
ng
Fix
"
git
l
og -
i
--grep"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
To
m
m
i
Virtanen
Install git
-
shell in bindir, too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
M
e
rge branch '
j
c/no-slim-shell'
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Hamano
Merge b
r
anch 'maint' to
syn
c
wi
t
h 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ham
a
no
GIT 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge branch 'ag/maint-
c
ombine-d
i
ff-fix' into maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Mer
g
e b
r
a
n
ch 'mv/main
t
-merge-fix' into maint
commit
|
commitdiff
|
tree
2008-08-24
Mark Levedahl
git-submodule
- Use "g
e
t_de
f
ault_remote
"
from git-parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
o
nathan Nieder
Docume
n
tation: cl
a
rify pager configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Nieder
Docum
e
n
tation: clarify pager
.
<cmd> conf
i
guration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Sim
o
n Hausmann
Clean
u
p
t
h
e git-p4 docume
n
t
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexander Gavril
o
v
Respect c
o
re
.
autocrlf in comb
i
n
ed di
f
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Miklos
Vajna
Makefil
e
:
e
n
a
ble SNP
R
INTF_RE
T
U
R
NS_BOGUS for HP-UX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C Hamano
t7606
:
fix
c
ustom merge te
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge branch
'ma
i
n
t
'
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Haman
o
merge: fix num
e
rus b
u
gs around "t
r
ivial mer
g
e" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Hamano
unpack_trees():
p
rotect the ha
n
dc
r
afted in-co
r
e index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
T
o
r Arvid Lund
git-p4: Fix on
e
-li
n
er in p4_write_pipe functio
n
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
David
A
guilar
git-subm
o
d
ule: replace duplicated code with a
m
odule_list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Nicolas P
i
tre
d
i
scard re
v
inde
x
dat
a
when p
a
ck
l
ist ch
a
nges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Dan He
n
sgen
git-
m
erge documentation: more det
a
ils a
b
ou
t
re
s
olv
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
A
l
e
x Ries
e
n
Extend "ch
e
c
k
out --track
"
D
WIM to support more cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jonathan del Strother
Revert "Convert output messages in merge-recursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Eric
Raible
Completion: add mis
s
ing '='
for 'diff --diff-
f
ilter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Ju
n
io C Ha
m
ano
te
m
plates/Makefile:
install is unneces
s
a
r
y, just
u
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Bra
n
don Casey
remote
.
c: add a function f
o
r deleting
a
refspec arr
a
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jo
h
annes
S
ixt
filter-bran
c
h: Grok special characters in tag n
a
mes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johannes
Sc
h
indelin
t
e
st-lib: do
n
o
t remove trash_
d
irecto
r
y if called with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Paolo Bonzini
p
r
o
vide more errors for the "merge into
empty
h
e
a
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Shawn O
.
Pe
a
rce
Make reflog query '@{1219188291}' act as '@{2008
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
N
eil Roberts
c
o
n
fig
.
mak
.
in
:
Pass on
L
D
FLAGS from configure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mark Levedahl
g
i
t-su
b
module
.
sh - Remove
t
r
a
i
l
i
ng
/
f
r
o
m
URL if
fou
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mi
k
los Vajna
Fix 'git he
l
p
h
elp'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branc
h
'm
a
int
'
commit
|
commitdiff
|
tree
2008-08-21
Brandon Casey
c
o
mpat/sn
p
rint
f
.
c: handle snprin
t
f's tha
t
alway
s
r
eturn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Jo
h
an Herl
a
nd
Teach "gi
t
di
f
f -p
"
HTML funcname patte
r
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Kirill Smelkov
Teach "git diff -
p
" Py
t
hon func
n
ame p
a
tterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Eri
c
Wong
git-svn:
f
ix dcommi
t
to urls with
e
mbe
d
de
d
use
r
n
ames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hamano
Merge
br
a
nc
h
'ml/submodule-
f
oreach'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch 'pm/log-exit-code'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Haman
o
Merge bran
c
h 'sb/commit-t
r
ee-
m
inileak'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Hamano
Me
r
ge branch
'
p
b/
r
eflog-dwim'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
amano
Merge
b
ranch 'jc/
a
dd-sto
p
-at-symlink
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge
b
ranch '
k
h/diff-tr
e
e'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Hamano
Merge branch 'mg/count-objects'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Haman
o
Merge branch
'
mz/p
u
sh-verbose'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merg
e
branch 'jc/index-extend
e
d-flags'
commit
|
commitdiff
|
tree
next