repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: move the global obuf to struct merge_options
2008-09-05
Mi
k
lo
s
Vajn
a
merg
e
-recursive: mov
e
the
g
lobal obuf
to st
r
uct merge_o
p
tions
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajna
me
r
g
e-recursive: g
e
t rid of the
inde
x
_
only global vari
a
ble
commit
|
commitdiff
|
tree
2008-09-04
Miklo
s
V
a
jn
a
m
e
rge-recur
s
ive: move call_d
e
pth t
o
struct merge_options
commit
|
commitdiff
|
tree
2008-09-03
Mik
l
os Vajna
c
herry-pick/revert: mak
e
dir
e
ct
i
nterna
l
call to merge_tree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-merge: avoid run_command_v_o
p
t
()
f
or rec
u
rsi
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
merge-re
c
ursive: introduce merge_options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
S
tephan Beye
r
merge-recursive
.
c: Add more generic merge_recursive_
g
eneric()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Va
j
na
Split out me
r
ge_
r
ecursive()
to m
e
rge-recurs
i
v
e
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
io C Haman
o
gitattributes: -
c
rlf is not
b
inary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
unio C Hamano
git-apply: Lo
o
sen "m
a
tch_beg
i
nning" lo
g
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Fix
e
xam
p
le in gi
t
-name-re
v
docume
n
t
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C H
a
m
ano
M
erge bran
c
h 'sp/mis
s
i
n
g-thi
n
-
b
ase' into maint
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C Hamano
Merge branch 'sb/d
a
emon'
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge branch
'af/maint-ins
t
all-n
o
-han
d
link'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2008-08-30
Junio C H
a
mano
s
h
ell: do not play duplicat
e
d defi
n
ition games t
o
s
hri
n
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Alex
R
iesen
Fix
u
se o
f
hardli
n
ks in "
m
ake in
s
ta
l
l
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C Hamano
Merge b
r
anch
'
np/verify-pack' into maint
commit
|
commitdiff
|
tree
2008-08-29
J
u
n
io C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2008-08-29
Tor Arvid Lund
git-p4:
Fix
c
heckout bug
wh
e
n us
i
ng --i
m
port
-
local
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Ci
a
rro
c
chi
tutorial: gentler illustratio
n
of Alice/Bob workflow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Jeff King
pretty=format: respect date format options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Bonz
i
ni
make
git-shell paranoi
d
a
b
out closed stdin/stdout/std
e
rr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Ya
n
n Dirson
Docume
n
t
g
itk --argscmd flag
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Linus Torvalds
Fix '--dirstat' with
c
ros
s
-directory renaming
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Bj
ö
rn Steinb
r
ink
for-e
a
ch-ref: Allo
w
a t
r
aili
n
g slash in t
h
e
p
at
t
erns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Al
e
x Ries
e
n
list_commands: only call git_exec_p
a
th if
it is n
e
ede
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Ale
x
Riese
n
All
o
w git help wor
k
without
P
ATH set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Make main_cmds
an
d
other_cmds local to b
u
iltin-
h
elp
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
R
e
m
o
ve us
e
les
s
memset of static command name lists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Remo
v
e
c
a
l
c
ula
t
ion
o
f
t
he longest c
o
mmand
name from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Brandon Casey
dir
.
c: Avoid c99 array initialization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
M
a
tthias Ke
s
tenholz
bash-c
o
mple
t
ion:
A
dd all submodule subc
o
mma
n
ds to
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-28
Junio
C
Ha
m
ano
Me
r
ge branch 'mv/merge
-
custom'
commit
|
commitdiff
|
tree
2008-08-28
Junio C
Ham
a
n
o
M
e
rge
branch 'ml/submodule'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merg
e
bra
n
ch 'am
/
cherry-p
i
ck-r
e
r
ere'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o
C
H
a
mano
Merge
branch 'jc/add-add
r
emove'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch 'np/verify-pack'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
M
e
rge branc
h
'da/submodule-sync'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merg
e
br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C H
a
mano
ctype
.
c: pr
o
tect t
i
n
y
C pr
e
processor cons
t
ants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
L
inus Torva
l
ds
i
ndex-pack:
b
e careful after fixing
u
p the h
e
ader/fo
o
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Simon Hausmann
M
a
ke it possible to
a
b
o
rt t
h
e su
b
mi
s
s
ion of a cha
n
ge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C Hamano
Merge br
a
nch 'af/maint-install-no-handlink'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o
C
Hamano
Merg
e
bran
c
h
'jc/no-slim-shell'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-27
Jeff King
forma
t
-patch:
u
se de
f
ault diff form
a
t even with
p
atch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Nguyễn
T
h
á
i Ngọ
c
Du
y
index-pack: setup git repos
i
to
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jone
s
Suppress
s
ome bash redi
r
ection e
r
ror messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
R
a
msay
Jo
n
e
s
Fix a warning (on cygwi
n
) to
all
o
w -Werror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
An
d
reas Färber
Ma
k
efile: always prov
i
de a fallback when ha
r
dlinks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hamano
daemon
.
c: minor s
t
yle
f
i
xup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
David
A
guilar
git-submodule: add "
s
y
n
c" command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hamano
Rev
e
rt "Bui
l
d-in "git-shel
l
""
commit
|
commitdiff
|
tree
2008-08-25
Jeff King
Fix "git log -i
--grep"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
To
m
mi Virt
a
nen
I
n
stall git-shell in bindir, to
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Hamano
M
erge branch 'jc/
n
o-slim-shell'
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C Ha
m
ano
Merg
e
b
r
anch 'main
t
'
t
o sync
with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Hamano
GIT 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
u
n
i
o C Hamano
Merge
b
ranch 'ag/maint-combin
e
-diff-
f
i
x' into mai
n
t
commit
|
commitdiff
|
tree
2008-08-24
Junio C H
a
mano
Merge branch 'mv/mai
n
t-merge-fi
x
' into maint
commit
|
commitdiff
|
tree
2008-08-24
M
a
rk Levedahl
git-submodule -
Use
"
get_d
e
f
au
l
t_remote" from git-parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jona
t
h
a
n Nied
e
r
Docume
n
t
a
tion:
c
larify page
r
configu
r
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jo
n
athan Nieder
Document
a
tion: c
l
ari
f
y pager
.
<cmd> c
o
nfiguratio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Simon Ha
u
sm
a
n
n
C
l
ean up the git-p4 docu
m
entation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexander Gavrilov
R
e
s
p
e
ct core
.
a
u
toc
r
l
f in combined diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Miklo
s
Vajna
Makefi
l
e: enable SNPRIN
T
F_RETURNS
_
B
OGUS for
H
P-UX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Hamano
t7606: fix custom mer
g
e test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
uni
o
C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
H
a
m
ano
me
r
ge
:
fi
x
numer
u
s bug
s
around "tr
i
v
i
a
l merge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Hamano
unpack_trees(): protect the ha
n
dcraf
t
ed in
-
core index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Tor Arvid Lun
d
git-p
4
: Fix one-liner in p4_w
r
i
t
e_p
i
pe function
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-submodule: r
e
pl
a
c
e
d
u
plica
t
ed code with a module_list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Nicolas
Pitr
e
discard
revi
n
dex
data
when
pack
l
ist changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Dan
Hen
s
gen
git-merge d
o
cumentation: more details
about r
e
s
ol
v
in
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
A
lex Ri
e
sen
Extend "checkou
t
--tr
a
ck" DWIM to support m
o
re case
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jo
n
athan del Strother
Revert "Convert outpu
t
messa
g
es in merge-
r
ec
u
rsiv
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Eric Raib
l
e
Completion: add mis
s
ing '=' for
'diff
-
-diff-filter
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio C Ham
a
no
t
emplates/Makefile: install is
u
nnec
e
ssary, ju
s
t use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Brandon Casey
remote
.
c:
a
d
d a fun
c
tion for de
l
e
ting
a
refspec array
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johannes Sixt
filter-branch: Grok s
p
ecial char
a
cters
i
n tag names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johannes Sch
i
ndelin
test-lib: do no
t
remove
trash_d
i
rect
o
ry if called
w
ith
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Paolo Bonzi
n
i
pr
o
v
i
de more errors for the "merge in
t
o emp
t
y head
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
S
ha
w
n
O
.
P
earce
M
ake re
f
lo
g
query '@{121
9
188291
}
' a
c
t as '@{2008
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Neil Roberts
c
onfig
.
mak
.
in:
P
ass on
L
DFLAGS from configu
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mark Levedahl
gi
t
-submod
u
le
.
sh -
Rem
o
ve
t
railing / fro
m
URL if found
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
M
iklos Vajna
Fix 'git
h
elp help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Hamano
M
erge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Brandon Ca
s
ey
compat/snpr
i
ntf
.
c: handle snprintf
'
s that alw
a
y
s
retu
r
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
J
o
han
Herland
Teach "git diff -p" HTML fu
n
cname patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Kirill Smel
k
ov
Teach "g
i
t diff
-
p" Python
funcname patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Er
i
c Wong
git
-
svn: fix dcommit to urls with embedded use
r
names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C H
a
man
o
Me
r
ge bra
n
ch 'ml/s
u
bmod
u
le-forea
c
h'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge br
a
nch 'pm
/
log-exit
-
code'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io
C
H
a
mano
M
e
rge
b
ranch 'sb/comm
i
t-
t
r
ee
-
minileak'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Haman
o
Merge branch 'pb/
r
eflog-
d
wim'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge
b
ra
n
ch
'
jc/add-stop-at
-
symlink'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
i
o
C Ha
m
ano
Merge branch 'kh/d
i
ff-tr
e
e
'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
H
a
mano
Merge branch 'mg/co
u
nt-objects'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branc
h
'mz/p
u
sh
-
verbose'
commit
|
commitdiff
|
tree
next