1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-01 19:26:10 +02:00
git/builtin
Junio C Hamano 8d676d85f7 Merge branch 'gv/portable'
* gv/portable:
  test-lib: use DIFF definition from GIT-BUILD-OPTIONS
  build: propagate $DIFF to scripts
  Makefile: Tru64 portability fix
  Makefile: HP-UX 10.20 portability fixes
  Makefile: HPUX11 portability fixes
  Makefile: SunOS 5.6 portability fix
  inline declaration does not work on AIX
  Allow disabling "inline"
  Some platforms lack socklen_t type
  Make NO_{INET_NTOP,INET_PTON} configured independently
  Makefile: some platforms do not have hstrerror anywhere
  git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
  test_cmp: do not use "diff -u" on platforms that lack one
  fixup: do not unconditionally disable "diff -u"
  tests: use "test_cmp", not "diff", when verifying the result
  Do not use "diff" found on PATH while building and installing
  enums: omit trailing comma for portability
  Makefile: -lpthread may still be necessary when libc has only pthread stubs
  Rewrite dynamic structure initializations to runtime assignment
  Makefile: pass CPPFLAGS through to fllow customization

Conflicts:
	Makefile
	wt-status.h
2010-06-21 06:02:44 -07:00
..
add.c Rewrite dynamic structure initializations to runtime assignment 2010-05-31 16:59:26 -07:00
annotate.c
apply.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
archive.c
bisect--helper.c
blame.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
branch.c enums: omit trailing comma for portability 2010-05-31 16:59:27 -07:00
bundle.c
cat-file.c Rewrite dynamic structure initializations to runtime assignment 2010-05-31 16:59:26 -07:00
check-attr.c
check-ref-format.c
checkout-index.c
checkout.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
clean.c
clone.c Merge branch 'ph/clone-message-reword' 2010-06-18 11:16:53 -07:00
commit-tree.c make commit_tree a library function 2010-04-01 23:53:54 -07:00
commit.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
config.c
count-objects.c
describe.c Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maint 2010-06-16 16:21:15 -07:00
diff-files.c
diff-index.c
diff-tree.c
diff.c
fast-export.c Merge branch 'maint' 2010-03-28 17:42:58 -07:00
fetch-pack.c
fetch.c Rewrite dynamic structure initializations to runtime assignment 2010-05-31 16:59:26 -07:00
fmt-merge-msg.c merge: --log appends shortlog to message if specified 2010-05-10 12:02:20 -07:00
for-each-ref.c Merge branch 'maint' 2010-06-07 22:15:31 -07:00
fsck.c
gc.c
grep.c Merge branch 'np/malloc-threading' into maint 2010-06-16 16:21:06 -07:00
hash-object.c
help.c enums: omit trailing comma for portability 2010-05-31 16:59:27 -07:00
index-pack.c Merge branch 'np/index-pack-memsave' into maint 2010-06-16 16:22:23 -07:00
init-db.c handle "git --bare init <dir>" properly 2010-05-10 11:25:37 -07:00
log.c Merge branch 'sd/log-decorate' 2010-05-08 22:36:14 -07:00
ls-files.c ls-files: allow relative pathspec 2010-06-05 09:14:31 -07:00
ls-remote.c ls-remote: print URL when no repo is specified 2010-05-11 22:55:44 -07:00
ls-tree.c
mailinfo.c enums: omit trailing comma for portability 2010-05-31 16:59:27 -07:00
mailsplit.c
merge-base.c
merge-file.c Merge branch 'rs/diff-no-minimal' 2010-06-13 11:20:46 -07:00
merge-index.c
merge-ours.c
merge-recursive.c
merge-tree.c Merge branch 'rs/diff-no-minimal' 2010-06-13 11:20:46 -07:00
merge.c Merge branch 'tc/merge-m-log' 2010-06-18 11:16:54 -07:00
mktag.c
mktree.c
mv.c
name-rev.c
notes.c Merge 'maint' updates in 2010-06-16 17:09:31 -07:00
pack-objects.c Merge branch 'np/malloc-threading' into maint 2010-06-16 16:21:06 -07:00
pack-redundant.c
pack-refs.c
patch-id.c patch-id: Add support for mbox format 2010-04-19 13:01:49 -07:00
prune-packed.c
prune.c
push.c Merge branch 'maint' 2010-04-09 22:43:18 -07:00
read-tree.c
receive-pack.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
reflog.c Merge branch 'jc/maint-no-reflog-expire-unreach-for-head' 2010-05-21 04:02:18 -07:00
remote.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
replace.c
rerere.c Merge branch 'rs/diff-no-minimal' 2010-06-13 11:20:46 -07:00
reset.c Sync with 1.7.0.4 2010-03-31 15:14:27 -07:00
rev-list.c Merge branch 'ef/maint-empty-commit-log' 2010-04-06 14:50:46 -07:00
rev-parse.c
revert.c Merge branch 'cc/revert-strategy' 2010-05-08 22:34:47 -07:00
rm.c
send-pack.c
shortlog.c Merge branch 'jn/shortlog' into maint 2010-06-16 16:22:51 -07:00
show-branch.c show-branch: use DEFAULT_ABBREV instead of 7 2010-05-25 09:48:49 -07:00
show-ref.c
stripspace.c
symbolic-ref.c
tag.c tag -v: use RUN_GIT_CMD to run verify-tag 2010-04-17 12:40:19 -07:00
tar-tree.c
unpack-file.c
unpack-objects.c
update-index.c
update-ref.c
update-server-info.c
upload-archive.c
var.c
verify-pack.c
verify-tag.c
write-tree.c