1 Version v1.7.7.5; changes since v1.7.7.4:
2 -----------------------------------------
5 mingw: give waitpid the correct signature
8 stripspace: fix outdated comment
9 fetch: create status table using strbuf
10 blame: don't overflow time buffer
16 Martin von Zweigbergk (1):
17 am: don't persist keepcr flag
20 git symbolic-ref: documentation fix
22 Nguyễn Thái Ngọc Duy (1):
23 checkout,merge: loosen overwriting untracked file check based on info/exclude
26 Add MYMETA.yml to perl/.gitignore
29 documentation fix: git difftool uses diff tools, not merge tools.
31 Ævar Arnfjörð Bjarmason (2):
32 apply: get rid of useless x < 0 comparison on a size_t type
33 cast variable in call to free() in builtin/diff.c and submodule.c
36 Version v1.7.7.4; changes since v1.7.7.3:
37 -----------------------------------------
40 notes merge: eliminate OUTPUT macro
41 Makefile: add missing header file dependencies
44 name-rev --all: do not even attempt to describe non-commit object
47 Marc-André Lureau (1):
48 mailmap: xcalloc mailmap_info
51 Version v1.7.7.3; changes since v1.7.7.2:
52 -----------------------------------------
55 pack-objects: mark add_to_write_order() as inline
56 pack-objects: use unsigned int for counter and offset values
57 pack-objects: rewrite add_descendants_to_write_order() iteratively
58 pack-objects: don't traverse objects unnecessarily
61 docs: don't mention --quiet or --exit-code in git-log(1)
63 Julien Muchembled (1):
64 gitweb: fix regression when filtering out forks
67 branch -m/-M: remove undocumented RENAMED-REF
68 docs: Update install-doc-quick
72 Version v1.7.7.2; changes since v1.7.7.1:
73 -----------------------------------------
76 attr.c: avoid inappropriate access to strbuf "buf" member
77 cleanup: use internal memory allocation wrapper functions everywhere
78 builtin/mv.c: plug miniscule memory leak
79 attr.c: respect core.ignorecase when matching attribute patterns
81 Carlos Martín Nieto (6):
82 Remove 'working copy' from the documentation and C code
83 fetch: free all the additional refspecs
84 t5510: add tests for fetch --prune
85 remote: separate out the remote_find_tracking logic into query_refspecs
86 fetch: honor the user-provided refspecs when pruning refs
87 fetch: treat --tags like refs/tags/*:refs/tags/* when pruning
90 bisect: fix exiting when checkout failed in bisect_start()
93 date.c: Support iso8601 timezone formats
96 gitweb: Strip non-printable characters from syntax highlighter output
99 add sha1_array API docs
100 quote.h: fix bogus comment
101 refactor argv_array into generic code
102 quote: provide sq_dequote_to_argv_array
103 bisect: use argv_array API
104 checkout: use argv_array API
105 run_hook: use argv_array API
106 pull,rebase: handle GIT_WORK_TREE better
109 make the sample pre-commit hook script reject names with newlines, too
112 http: remove extra newline in error message
113 http: avoid empty error messages for some curl errors
116 mergetool: Use args as pathspec to unmerged files
119 refactor run_receive_hook()
120 diff: teach --stat/--numstat to honor -U$num
121 mergetool: no longer need to save standard input
122 attr: read core.attributesfile from git_default_core_config
125 Martin von Zweigbergk (4):
126 remote: write correct fetch spec when renaming remote 'remote'
127 remote: "rename o foo" should not rename ref "origin/bar"
128 remote rename: warn when refspec was not updated
129 remote: only update remote-tracking branch if updating refspec
132 send-email: Honour SMTP domain when using TLS
134 Michael Haggerty (1):
135 notes_merge_commit(): do not pass temporary buffer to other function
137 Michael J Gruber (3):
138 unpack-trees: print "Aborting" to stderr
139 git-read-tree.txt: language and typography fixes
140 git-read-tree.txt: correct sparse-checkout and skip-worktree description
142 Nguyễn Thái Ngọc Duy (2):
143 git-read-tree.txt: update sparse checkout examples
144 Reindent closing bracket using tab instead of spaces
147 t7511: avoid use of reserved filename on Windows.
150 gitweb: Fix links to lines in blobs when javascript-actions are enabled
152 Ramsay Allan Jones (1):
153 t9159-*.sh: skip for mergeinfo test for svn <= 1.4
156 read-cache.c: fix index memory allocation
158 Richard Hartmann (1):
159 clone: Quote user supplied path in a single quote pair
162 remote-curl: Fix warning after HTTP failure
165 Documentation/git-update-index: refer to 'ls-files'
168 Documentation: basic configuration of notes.rewriteRef
171 Version v1.7.7.1; changes since v1.7.7:
172 ---------------------------------------
175 rev-list: Demonstrate breakage with --ancestry-path --all
178 strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline()
181 Support ERR in remote archive like in fetch/push
184 merge-one-file: fix "expr: non-numeric argument"
187 fetch: avoid quadratic loop checking for updated submodules
188 filter-branch: use require_clean_work_tree
191 fix "git apply --index ..." not to deref NULL
194 Makefile: do not set setgid bit on directories on GNU/kFreeBSD
195 RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting
198 revision: keep track of the end-user input from the command line
199 revision: do not include sibling history in --ancestry-path output
200 rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree
201 traverse_trees(): allow pruning with pathspec
202 unpack-trees: allow pruning with pathspec
203 diff-index: pass pathspec down to unpack-trees machinery
204 fsck: do not abort upon finding an empty blob
205 Teach progress eye-candy to fetch_refs_from_bundle()
206 apply --whitespace=error: correctly report new blank lines at end
207 checkout $tree $path: do not clobber local changes in $path not in $tree
208 diff: resurrect XDF_NEED_MINIMAL with --minimal
210 Almost ready for 1.7.7.1
214 rebase -i: clean error message for --continue after failed exec
215 config: display key_delim for config --bool --get-regexp
217 Michael Schubert (1):
218 patch-id.c: use strbuf instead of a fixed buffer
220 Nguyễn Thái Ngọc Duy (4):
221 merge: keep stash[] a local variable
222 merge: use return value of resolve_ref() to determine if HEAD is invalid
223 merge: remove global variable head[]
224 Accept tags in HEAD or MERGE_HEAD
226 Nicolas Morey-Chaisemartin (1):
227 grep: Fix race condition in delta_base_cache
230 Revert removal of multi-match discard heuristic in 27af01
231 t1304: fall back to $USER if $LOGNAME is not defined
234 Symlink mergetools scriptlets into valgrind wrappers
235 t6019: avoid refname collision on case-insensitive systems
238 Version v1.7.7; changes since v1.7.7-rc3:
239 -----------------------------------------
242 contrib/hooks: adapt comment about Debian install location for contrib hooks
243 templates/hooks--*: remove sample hooks without any functionality
246 Documentation/gitnamespaces.txt: cater to older asciidoc
250 Version v1.7.7-rc3; changes since v1.7.7-rc2:
251 ---------------------------------------------
254 describe: Refresh the index when run with --dirty
257 git-mergetool: check return value from read
260 t4014: clean up format.thread config after each test
264 merge-recursive: Do not look at working tree during a virtual ancestor merge
268 Version v1.7.7-rc2; changes since v1.7.7-rc1:
269 ---------------------------------------------
272 git-svn: teach git-svn to populate svn:mergeinfo
274 Frédéric Heitzmann (1):
275 Disambiguate duplicate t9160* tests
278 branch --set-upstream: regression fix
282 format-patch: ignore ui.color
285 Version v1.7.7-rc1; changes since v1.7.7-rc0:
286 ---------------------------------------------
289 Documentation: Grammar correction, wording fixes and cleanup
290 Mark http-fetch without -a as deprecated
293 t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh
296 t5540-http-test: shorten grep pattern
299 git-svn: Teach dcommit --mergeinfo to handle multiple lines
302 Prevent force-updating of the current branch
303 Show interpreted branch name in error messages
306 fast-import: add input format tests
307 fast-import: don't fail on omitted committer name
308 fast-import: check committer name more strictly
309 fsck: add a few committer name tests
310 fsck: improve committer/author check
311 fast-import: add a test for tree delta base corruption
312 fast-import: prevent producing bad delta
313 fast-import: count and report # of calls to diff_delta in stats
314 fast-import: treat cat-blob as a delta base hint for next blob
315 fast-import: add tests for tagging blobs
316 fast-import: allow to tag newly created objects
319 t6042: Add a testcase where git deletes an untracked file
320 t6042: Add failing testcase for rename/modify/add-source conflict
321 t6042: Add a pair of cases where undetected renames cause issues
322 t6042: Add a testcase where undetected rename causes silent file deletion
323 t6042: Add tests for content issues with modify/rename/directory conflicts
324 t6042: Ensure rename/rename conflicts leave index and workdir in sane state
325 t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts
326 t6036: Add differently resolved modify/delete conflict in criss-cross test
327 t6036: criss-cross with weird content can fool git into clean merge
328 t6036: tests for criss-cross merges with various directory/file conflicts
329 t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify
330 t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify
331 t6022: Remove unnecessary untracked files to make test cleaner
332 t6022: New tests checking for unnecessary updates of files
333 t6022: Add testcase for merging a renamed file with a simple change
334 merge-recursive: Make BUG message more legible by adding a newline
335 merge-recursive: Correct a comment
336 merge-recursive: Mark some diff_filespec struct arguments const
337 merge-recursive: Consolidate different update_stages functions
338 merge-recursive: Remember to free generated unique path names
339 merge-recursive: Avoid working directory changes during recursive case
340 merge-recursive: Fix recursive case with D/F conflict via add/add conflict
341 merge-recursive: Fix sorting order and directory change assumptions
342 merge-recursive: Fix code checking for D/F conflicts still being present
343 merge-recursive: Save D/F conflict filenames instead of unlinking them
344 merge-recursive: Split was_tracked() out of would_lose_untracked()
345 merge-recursive: Allow make_room_for_path() to remove D/F entries
346 merge-recursive: Split update_stages_and_entry; only update stages at end
347 merge-recursive: Fix deletion of untracked file in rename/delete conflicts
348 merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
349 merge-recursive: Add comments about handling rename/add-source cases
350 merge-recursive: Improve handling of rename target vs. directory addition
351 merge-recursive: Consolidate process_entry() and process_df_entry()
352 merge-recursive: Cleanup and consolidation of rename_conflict_info
353 merge-recursive: Provide more info in conflict markers with file renames
354 merge-recursive: When we detect we can skip an update, actually skip it
355 merge-recursive: Fix modify/delete resolution in the recursive case
356 merge-recursive: Introduce a merge_file convenience function
357 merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
358 merge-recursive: Small cleanups for conflict_rename_rename_1to2
359 merge-recursive: Defer rename/rename(2to1) handling until process_entry
360 merge-recursive: Record more data needed for merging with dual renames
361 merge-recursive: Create function for merging with branchname:file markers
362 merge-recursive: Consider modifications in rename/rename(2to1) conflicts
363 merge-recursive: Make modify/delete handling code reusable
364 merge-recursive: Have conflict_rename_delete reuse modify/delete code
365 merge-recursive: add handling for rename/rename/add-dest/add-dest
366 merge-recursive: Fix working copy handling for rename/rename/add/add
367 t6022: Add testcase for spurious "refusing to lose untracked" messages
368 merge-recursive: Fix spurious 'refusing to lose untracked file...' messages
369 t6022: Additional tests checking for unnecessary updates of files
370 merge-recursive: Avoid unnecessary file rewrites
371 t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify
372 merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
373 merge-recursive: Don't re-sort a list whose order we depend upon
376 git-svn: fix fetch with moved path when using rewriteRoot
378 Fredrik Gustafsson (1):
379 push: Don't push a repository with unpushed submodules
381 Fredrik Kuivinen (6):
382 Add obstack.[ch] from EGLIBC 2.10
383 Add string search routines from GNU grep
384 Adapt the kwset code to Git
387 obstack: Fix portability issues
389 Giuseppe Bilotta (2):
390 am: format is in $patch_format, not parse_patch
391 am: fix stgit patch mangling
394 t3030: fix accidental success in symlink rename
395 t7006: modernize calls to unset
396 test-lib: add helper functions for config
397 t7006: use test_config helpers
398 setup_pager: set GIT_PAGER_IN_USE
399 diff: refactor COLOR_DIFF from a flag into an int
400 git_config_colorbool: refactor stdout_is_tty handling
401 color: delay auto-color decision until point of use
402 config: refactor get_colorbool function
403 diff: don't load color config in plumbing
404 want_color: automatically fallback to color.ui
405 support pager.* for external commands
408 fetch: skip on-demand checking when no submodules are configured
411 string-list: Add API to remove an item from an unsorted list
412 t3005: do not assume a particular order of stdout and stderr of git-ls-files
415 bisect: take advantage of gettextln, eval_gettextln.
418 Documentation/remote-helpers: explain capabilities first
421 combine-diff: support format_callback
422 read_gitfile_gently(): rename misnamed function to read_gitfile()
423 clone: allow more than one --reference
424 clone: clone from a repository with relative alternates
425 Update draft release notes to 1.7.7
426 Documentation: clarify "git clean -e <pattern>"
427 Update draft release notes to 1.7.7
428 Revert "Merge branch 'cb/maint-quiet-push' into maint"
430 Update draft release notes to 1.7.7
431 Minor update to how-to maintain git
432 Prepare for 1.7.6.3 maintenance release
437 Documentation/git-remote-helpers: explain how import works with multiple refs
438 (short) documentation for the testgit remote helper
440 Michael Haggerty (9):
442 Document struct match_attr
443 Increment num_attr in parse_attr_line(), not parse_attr()
444 Change parse_attr() to take a pointer to struct attr_state
445 Determine the start of the states outside of the pass loop
446 Change while loop into for loop
447 Unroll the loop over passes
448 check-ref-format --print: Normalize refnames that start with slashes
449 Forbid DEL characters in reference names
451 Michael J Gruber (3):
452 git-notes.txt: clarify -C vs. copy and -F
453 log: Do not decorate replacements with --no-replace-objects
454 RelNotes/1.7.7: minor fixes
456 Michael Stapelberg (1):
457 git-daemon.txt: specify --timeout in seconds
460 branch -v: honor core.abbrev
462 Nguyễn Thái Ngọc Duy (6):
463 decoration: do not mis-decorate refs with same prefix
464 Add for_each_commit_graft() to iterate all grafts
465 Move write_shallow_commits to fetch-pack.c
466 log: decorate grafted commits with "grafted"
467 log: decorate "replaced" on to replaced commits
468 clone: allow to clone from .git file
471 git-p4: simple branch tests edits
474 git-svn: New flag to emulate empty directories
476 Sverre Rabbelier (1):
477 SubmittingPathces: remove Cogito reference
480 xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()
481 xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()
484 Use memmove in ident_to_git
485 t4014: check for empty files from git format-patch --stdout
486 t4014: invoke format-patch with --stdout where intended
487 t4014: "no-add-headers" is actually called "no-add-header"
488 Document negated forms of format-patch --to --cc --add-headers
489 strbuf_grow(): maintain nul-termination even for new buffer
490 Documentation: clarify effects of -- <path> arguments
491 t3903: fix misquoted rev-parse invocation
494 git-p4: Allow setting rename/copy detection threshold
495 git-p4: Add description of rename/copy detection options
496 git-p4: Add test case for rename detection
497 git-p4: Add test case for copy detection
498 git-p4: Process detectCopiesHarder with --bool
499 git-p4: Correct branch base depot path detection
500 git-p4: Allow filtering Perforce branches by user
501 git-p4: Allow branch definition with git config
502 git-p4: Add simple test case for branch import
505 Version v1.7.7-rc0; changes since v1.7.6.4:
506 -------------------------------------------
509 describe: Refresh the index when run with --dirty
512 Add profile feedback build to git
513 Add explanation of the profile feedback build to the README
515 Clemens Buchacher (1):
516 commit: allow partial commits with relative paths
519 setup: Provide GIT_PREFIX to built-ins
520 git: Remove handling for GIT_PREFIX
521 git-mergetool--lib: Make vimdiff retain the current directory
522 t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests
523 difftool--helper: Make style consistent with git
524 mergetool--lib: Make style consistent with git
525 mergetool--lib: Refactor tools into separate files
526 mergetools/meld: Use '--output' when available
529 am: ignore leading whitespace before patch
532 stash: Add --include-untracked option to stash and remove all untracked files
535 remote-helpers: export GIT_DIR variable to helpers
536 parse-options: export opterr, optbug
537 Reduce parse-options.o dependencies
538 doc/fast-import: document feature import-marks-if-exists
541 http: pass http.cookiefile using CURLOPT_COOKIEFILE
544 verify_path: consider dos drive prefix
545 connect: only log if all attempts failed (ipv4)
547 Fredrik Gustafsson (2):
548 git-sh-setup: add die_with_status
549 submodule update: continue when a checkout fails
552 gitweb.js: No need for inProgress in blame_incremental.js
553 gitweb.js: No need for loop in blame_incremental's handleResponse()
554 gitweb.js: use setTimeout rather than setInterval in blame_incremental.js
555 gitweb: Check permissions first in git_search
556 gitweb: Split body of git_search into subroutines
557 gitweb: Clean up code in git_search_* subroutines
558 gitweb: Make git_search_* subroutines render whole pages
559 gitweb: Refactor git_header_html
560 git-instaweb: Extract configuring web server into configure_httpd
561 git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf
562 git-instaweb: Move all actions at the end of script
563 git-instaweb: Check that correct config file exists for (re)start
564 gitweb: Introduce common system-wide settings for convenience
565 gitweb: Git config keys are case insensitive, make config search too
568 t: add tests for cloning remotes with detached HEAD
569 consider only branches in guess_remote_head
570 make copy_ref globally available
571 clone: always fetch remote HEAD
572 limit "contains" traversals based on commit timestamp
573 default core.clockskew variable to one day
574 archive: reorder option parsing and config reading
575 archive-tar: don't reload default config options
576 archive: refactor list of archive formats
577 archive: pass archiver struct to write_archive callback
578 archive: move file extension format-guessing lower
579 archive: refactor file extension format-guessing
580 archive: implement configurable tar filters
581 archive: provide builtin .tar.gz filter
582 upload-archive: allow user to turn off filters
583 parse-options: add OPT_STRING_LIST helper
584 remote: use new OPT_STRING_LIST
585 config: make git_config_parse_parameter a public function
586 clone: accept config options on the command line
587 git skew: a tool to find how big a clock skew exists in the history
588 transport-helper: fix minor leak in push_refs_with_export
589 t5800: factor out some ref tests
590 t5800: document some non-functional parts of remote helpers
591 git-remote-testgit: import non-HEAD refs
592 transport-helper: don't feed bogus refs to export push
593 git_remote_helpers: push all refs during a non-local export
594 streaming: free git_istream upon closing
595 docs: put listed example commands in backticks
598 Documentation/submodule: add command references and update options
601 sha1_file: use the correct type (ssize_t, not size_t) for read-style function
604 sh-i18n--envsubst: do not crash when no arguments are given
605 mingw.c: move definition of mingw_getenv down
606 Windows: teach getenv to do a case-sensitive search
607 rebase: do not print lots of usage hints after an obvious error message
608 Make test number unique
609 Skip archive --remote tests on Windows
610 t3900: do not reference numbered arguments from the test script
613 Add option hooks.diffopts to customize change summary in post-receive-email
616 bisect: move argument parsing before state modification.
617 bisect: use && to connect statements that are deferred with eval.
618 bisect: add tests to document expected behaviour in presence of broken trees.
619 bisect: introduce support for --no-checkout option.
620 bisect: introduce --no-checkout support into porcelain.
621 bisect: add tests for the --no-checkout option.
622 bisect: add documentation for --no-checkout option.
623 bisect: cleanup whitespace errors in git-bisect.sh.
624 bisect: replace "; then" with "\n<tab>*then"
625 misc-sh: fix up whitespace in some other .sh files.
626 gettext: add gettextln, eval_gettextln to encode common idiom
627 git-am: take advantage of gettextln and eval_gettextln.
628 pull: take advantage of eval_gettextln
629 stash: take advantage of eval_gettextln
630 submodule: take advantage of gettextln and eval_gettextln.
631 bisect: add support for bisecting bare repositories
634 test: simplify return value of test_run_
635 test: cope better with use of return for errors
636 revert: plug memory leak in "cherry-pick root commit" codepath
637 merge-recursive: take advantage of hardcoded empty tree
640 Fix prefix handling in ref iteration functions
641 ref namespaces: infrastructure
642 ref namespaces: Support remote repositories via upload-pack and receive-pack
643 ref namespaces: documentation
644 ref namespaces: tests
647 index-pack: group the delta-base array entries also by type
648 write_idx_file: introduce a struct to hold idx customization options
650 write_idx_file: need_large_offset() helper function
651 index-pack --verify: read anomalous offsets from v2 idx file
652 packed_object_info_detail(): do not return a string
653 sha1_object_info_extended(): expose a bit more info
654 sha1_object_info_extended(): hint about objects in delta-base cache
655 unpack_object_header(): make it public
656 write_entry(): separate two helper functions out
657 streaming: a new API to read from the object store
658 streaming_write_entry(): use streaming API in write_entry()
659 convert: CRLF_INPUT is a no-op in the output codepath
660 streaming_write_entry(): support files with holes
661 streaming: read non-delta incrementally from a pack
662 sha1_file.c: expose helpers to read loose objects
663 streaming: read loose objects incrementally
664 checkout: make advice when reattaching the HEAD less loud
665 merge: reword the final message
666 convert.h: move declarations for conversion from cache.h
667 Add streaming filter API
668 stream filter: add "no more input" to the filters
669 Add LF-to-CRLF streaming conversion
670 streaming filter: ident filter
671 streaming: filter cascading
672 t0021: test application of both crlf and ident
673 diff --stat-count: finishing touches
674 index-pack: a miniscule refactor
675 index-pack: start learning to emulate "verify-pack -v"
676 index-pack: show histogram when emulating "verify-pack -v"
677 verify-pack: use index-pack --verify
678 verify_path(): simplify check at the directory boundary
679 git-submodule.sh: clarify the "should we die now" logic
680 Add option to disable NORETURN
682 core: log offset pack data accesses happened
683 pack-objects: optimize "recency order"
684 diff-lib: simplify do_diff_cache()
685 diff-lib: refactor run_diff_index() and do_diff_cache()
686 Revert clock-skew based attempt to optimize tag --contains traversal
687 Update draft release notes to 1.7.7
688 Update draft release notes to 1.7.7
689 bisect: further style nitpicks
690 filter-branch.sh: de-dent usage string
691 Update draft release notes to 1.7.7
692 test: consolidate definition of $LF
694 Update draft release notes to 1.7.7
695 Update draft release notes to 1.7.7
696 commit: reduce use of redundant global variables
697 Update draft release notes to 1.7.7
701 gitweb: allow space as delimiter in mime.types
704 Update the Interix default build configuration.
706 Michael Haggerty (29):
707 doc: Add a link from gitattributes(5) to git-check-attr(1)
708 doc: Correct git_attr() calls in example code
709 Remove anachronism from comment
710 Disallow the empty string as an attribute name
711 git-check-attr: Add missing "&&"
712 git-check-attr: Add tests of command-line parsing
713 Provide access to the name attribute of git_attr
714 git-check-attr: Use git_attr_name()
715 Teach prepare_attr_stack() to figure out dirlen itself
716 Extract a function collect_all_attrs()
717 Remove redundant call to bootstrap_attr_stack()
718 Remove redundant check
719 Allow querying all attributes on a file
720 git-check-attr: Extract a function output_attr()
721 git-check-attr: Introduce a new variable
722 git-check-attr: Extract a function error_with_usage()
723 git-check-attr: Handle each error separately
724 git-check-attr: Process command-line args more systematically
725 git-check-attr: Error out if no pathnames are specified
726 git-check-attr: Add an --all option to show all attributes
727 git-check-attr: Drive two tests using the same raw data
728 git-check-attr: Fix command-line handling to match docs
729 Rename git_checkattr() to git_check_attr()
730 git-check-attr: test that no output is written to stderr
731 git-check-attr: Demonstrate problems with unnormalized paths
732 git-check-attr: Demonstrate problems with relative paths
733 git-check-attr: Normalize paths
734 test-path-utils: Add subcommand "absolute_path"
735 test-path-utils: Add subcommand "prefix_path"
737 Michael J Gruber (3):
738 diff.c: omit hidden entries from namelen calculation with --stat
739 diff: introduce --stat-lines to limit the stat lines
740 diff-options.txt: describe --stat-{width,name-width,count}
743 git-p4: use test_when_finished in tests
744 git-p4: add missing && in test
745 git-p4: one test missing config git-p4.skipSubmitEditCheck
746 git-p4: commit time should be most recent p4 change time
748 Ramsay Allan Jones (3):
749 help.c: Fix detection of custom merge strategy on cygwin
750 t1301-*.sh: Fix the 'forced modes' test on cygwin
751 config.c: Make git_config() work correctly when called recursively
754 t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test
755 grep: fix coloring of hunk marks between files
758 grep: add option to show whole function as context
759 grep: long context options
762 Tolerate zlib deflation with window size < 32Kb
764 Sverre Rabbelier (14):
765 t5800: use skip_all instead of prereq
766 remote-curl: accept empty line as terminator
767 git-remote-testgit: only push for non-local repositories
768 git-remote-testgit: fix error handling
769 fast-import: introduce 'done' command
770 fast-export: support done feature
771 transport-helper: factor out push_update_refs_status
772 transport-helper: check status code of finish_command
773 transport-helper: use the new done feature where possible
774 transport-helper: update ref status after push with export
775 transport-helper: change import semantics
776 transport-helper: Use capname for refspec capability too
777 transport-helper: implement marks location as capability
778 transport-helper: die early on encountering deleted refs
781 xdiff/xprepare: use memset()
782 xdiff/xprepare: refactor abort cleanups
783 xdiff/xpatience: factor out fall-back-diff function
784 t4033-diff-patience: factor out tests
785 teach --histogram to diff
786 xdiff/xprepare: skip classification
787 xdiff/xprepare: use a smaller sample size for histogram diff
788 xdiff: do away with xdl_mmfile_next()
789 http.c: fix an invalid free()
790 Makefile: some changes for http-related flag documentation
791 xdiff/xhistogram: rework handling of recursed results
792 xdiff/xhistogram: rely on xdl_trim_ends()
793 xdiff/xhistogram: drop need for additional variable
796 A Windows path starting with a backslash is absolute
797 real_path: do not assume '/' is the path seperator
798 verify_dotfile(): do not assume '/' is the path seperator
801 Makefile: add Minix configuration options.
803 maximilian attems (2):
804 am: pass exclude down to apply
805 am: Document new --exclude=<path> option
807 Ævar Arnfjörð Bjarmason (48):
808 i18n: git-am add git-sh-i18n
809 i18n: git-am one-line gettext $msg; echo
810 i18n: git-am multi-line getttext $msg; echo
811 i18n: git-am eval_gettext messages
812 i18n: git-am gettext + gettext to stderr message
813 i18n: git-am die messages
814 i18n: git-am cannot_fallback messages
815 i18n: git-am clean_abort messages
816 i18n: git-am "Apply?" message
817 i18n: git-am "Falling back" say message
818 i18n: git-am core say messages
819 i18n: git-am printf(1) message to eval_gettext
820 i18n: git-pull add git-sh-i18n
821 i18n: git-pull die messages
822 i18n: git-pull eval_gettext + die message
823 i18n: git-pull eval_gettext + warning message
824 i18n: git-submodule add git-sh-i18n
825 i18n: git-submodule echo + eval_gettext messages
826 i18n: git-submodule say + eval_gettext messages
827 i18n: git-submodule die + eval_gettext messages
828 i18n: git-submodule $update_module say + die messages
829 i18n: git-submodule "cached cannot be used" message
830 i18n: git-submodule "Submodule change[...]" messages
831 i18n: git-submodule $errmsg messages
832 i18n: git-submodule "Entering [...]" message
833 i18n: git-submodule "[...] path is ignored" message
834 i18n: git-submodule "path not initialized" message
835 i18n: git-submodule "blob" and "submodule" messages
836 i18n: git-stash add git-sh-i18n
837 i18n: git-stash echo + gettext message
838 i18n: git-stash say + gettext messages
839 i18n: git-stash die + gettext messages
840 i18n: git-stash die + eval_gettext messages
841 i18n: git-stash die + eval_gettext $* messages
842 i18n: git-stash die + eval_gettext $1 messages
843 i18n: git-stash "unknown option" message
844 i18n: git-stash drop_stash say/die messages
845 i18n: git-bisect add git-sh-i18n
846 i18n: git-bisect gettext + echo message
847 i18n: git-bisect echo + gettext messages
848 i18n: git-bisect echo + eval_gettext message
849 i18n: git-bisect die + gettext messages
850 i18n: git-bisect die + eval_gettext messages
851 i18n: git-bisect bisect_run + $@ messages
852 i18n: git-bisect bisect_reset + $1 messages
853 i18n: git-bisect bisect_replay + $1 messages
854 i18n: git-bisect [Y/n] messages
855 i18n: git-bisect bisect_next_check "You need to" message
858 gitweb: pass string after encoding in utf-8 to syntax highlighter
861 Version v1.7.6.4; changes since v1.7.6.3:
862 -----------------------------------------
865 describe: Refresh the index when run with --dirty
867 Clemens Buchacher (1):
868 ls-files: fix pathspec display on error
870 Giuseppe Bilotta (1):
871 am: format is in $patch_format, not parse_patch
874 git-mergetool: check return value from read
877 t3005: do not assume a particular order of stdout and stderr of git-ls-files
880 read_gitfile_gently(): rename misnamed function to read_gitfile()
881 clone: allow more than one --reference
882 clone: clone from a repository with relative alternates
885 Michael Haggerty (2):
886 check-ref-format --print: Normalize refnames that start with slashes
887 Forbid DEL characters in reference names
889 Michael J Gruber (1):
890 branch.c: use the parsed branch name
892 Nguyễn Thái Ngọc Duy (1):
893 clone: allow to clone from .git file
896 Version v1.7.6.3; changes since v1.7.6.2:
897 -----------------------------------------
900 Do not log unless all connect() attempts fail
903 status: fix bug with missing --ignore files
904 tag: speed up --contains calculation
905 strbuf_split: add a max parameter
906 fix "git -c" parsing of values with equals signs
907 config: die on error in command-line config
908 config: avoid segfault when parsing command-line config
909 strbuf: allow strbuf_split to work on non-strbufs
910 config: use strbuf_split_str instead of a temporary strbuf
911 reset: give better reflog messages
914 fetch: skip on-demand checking when no submodules are configured
917 Documentation: quote double-dash for AsciiDoc
918 Documentation/i18n: quote double-dash for AsciiDoc
921 git status --ignored: tests and docs
922 mergetool: check return value from read
923 Prepare for 1.7.6.3 maintenance release
926 Michael Schubert (1):
927 reflog: actually default to subcommand 'show'
929 Sverre Rabbelier (1):
930 SubmittingPathces: remove Cogito reference
933 tests: cleanup binary test vector files
936 Version v1.7.6.2; changes since v1.7.6.1:
937 -----------------------------------------
940 whitespace: have SP on both sides of an assignment "="
941 Revert "Merge branch 'cb/maint-quiet-push' into maint"
945 update-ref: whitespace fix
948 Documentation: clarify effects of -- <path> arguments
951 Version v1.7.6.1; changes since v1.7.6:
952 ---------------------------------------
955 Fix documentation of fetch-pack that implies that the client can disconnect after sending wants.
956 Document the underlying protocol used by shallow repositories and --depth commands.
959 rebase -i -p: include non-first-parent commits in todo list
962 Documentation: clearly specify what refs are honored by core.logAllRefUpdates
965 t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin
966 git-submodule.sh: preserve stdin for the command spawned by foreach
969 get_indexed_object can return NULL if nothing is in that slot; check for it
971 Carlos Martín Nieto (1):
972 Documentation: clarify the invalidated tree entry format
974 Clemens Buchacher (3):
975 error_routine: use parent's stderr if exec fails
976 propagate --quiet to send-pack/receive-pack
977 notice error exit from pager
980 doc/fast-import: clarify notemodify command
983 Documentation: ignore *.pdf files
984 Documentation/Makefile: add *.pdf to `clean' target
987 connect: correctly number ipv6 network adapter
989 Fredrik Kuivinen (1):
990 Makefile: Track changes to LDFLAGS and relink when necessary
993 add gitignore entry to description about how to write a builtin
994 add technical documentation about ref iteration
997 Documentation: minor grammatical fix in rev-list-options.txt
1000 gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss
1001 gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss
1004 combine-diff: split header printing into its own function
1005 combine-diff: calculate mode_differs earlier
1006 combine-diff: handle binary files as binary
1007 refactor get_textconv to not require diff_filespec
1008 combine-diff: respect textconv attributes
1009 tag: accept multiple patterns for --list
1010 docs: document --textconv diff option
1011 t7400: fix bogus test failure with symlinked trash
1012 fast-export: quote paths in output
1013 am: refresh the index at start and --resolved
1016 submodule add: test failure when url is not configured in superproject
1017 submodule add: allow relative repository path even when no url is set
1018 submodule add: clean up duplicated code
1019 fetch: Also fetch submodules in subdirectories in on-demand mode
1020 submodule add: always initialize .git/config entry
1021 tests: print failed test numbers at the end of the test run
1022 submodule: update and add must honor --quiet flag
1024 Johannes Schindelin (1):
1025 get_pwd_cwd(): Do not trust st_dev/st_ino blindly
1028 Add a test to check that git ls-tree sets non-zero exit code on error.
1029 Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.
1031 Julian Phillips (1):
1032 remote-curl: Add a format check to parsing of info/refs
1034 Junio C Hamano (29):
1035 diff-index --quiet: learn the "stop feeding the backend early" logic
1036 checkout -b <name>: correctly detect existing branch
1037 sha1_file.c: "legacy" is really the current format
1038 zlib wrapper: refactor error message formatter
1039 zlib: wrap remaining calls to direct inflate/inflateEnd
1040 zlib: wrap inflateInit2 used to accept only for gzip format
1041 zlib: wrap deflate side of the API
1042 zlib: wrap deflateBound() too
1043 zlib: zlib can only process 4GB at a time
1044 zlib: allow feeding more than 4GB in one go
1045 t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met
1046 cygwin: trust executable bit by default
1047 git-remote.txt: avoid sounding as if loose refs are the only ones in the world
1048 check-ref-format doc: de-emphasize the implementation detail of a ref
1049 git.txt: de-emphasize the implementation detail of a ref
1050 glossary: update description of "tag"
1051 glossary: update description of head and ref
1052 glossary: clarify description of HEAD
1053 submodule sync: do not auto-vivify uninteresting submodule
1054 "branch -d" can remove more than one branches
1055 test: skip clean-up when running under --immediate mode
1056 checkout: do not write bogus reflog entry out
1057 reset [<commit>] paths...: do not mishandle unmerged paths
1058 diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
1059 receive-pack: do not overstep command line argument array
1060 helping smart-http/stateless-rpc fetch race
1062 Update draft release notes for 1.7.6.1
1065 Martin von Zweigbergk (2):
1066 Documentation: use [verse] for SYNOPSIS sections
1067 rebase: clarify "restore the original branch"
1069 Michael Haggerty (6):
1070 git-svn: Demonstrate a bug with root commits in mergeinfo ranges
1071 git-svn: Disambiguate rev-list arguments to improve error message
1072 git-svn: Correctly handle root commits in mergeinfo ranges
1073 gitattributes: Clarify discussion of attribute macros
1074 gitattributes: Reword "attribute macro" to "macro attribute"
1075 Do not use C++-style comments
1077 Michael Schubert (1):
1078 help_unknown_cmd: do not propose an "unknown" cmd
1081 filter-branch: Export variable `workdir' for --commit-filter
1084 git-remote.txt: fix wrong remote refspec
1086 Nguyễn Thái Ngọc Duy (3):
1087 Break down no-lstat() condition checks in verify_uptodate()
1088 checkout-index: remove obsolete comment
1089 fetch-pack: check for valid commit from server
1092 pull: remove extra space from reflog message
1094 Pavan Kumar Sunkara (1):
1095 git-config: Remove extra whitespaces
1097 Peter Collingbourne (1):
1098 Documentation: git-filter-branch honors replacement refs
1101 Version v1.7.6; changes since v1.7.6-rc3:
1102 -----------------------------------------
1108 completion: replace core.abbrevguard to core.abbrev
1111 Version v1.7.6-rc3; changes since v1.7.6-rc2:
1112 ---------------------------------------------
1115 builtin/gc.c: add missing newline in message
1118 sh-i18n--envsubst.c: do not #include getopt.h
1120 Christof Krüger (1):
1121 Documentation: git diff --check respects core.whitespace
1124 Fix typo: existant->existent
1127 gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled
1130 t/Makefile: pass test opts to valgrind target properly
1131 tests: link shell libraries into valgrind directory
1134 plug a few coverity-spotted leaks
1137 t7810: avoid unportable use of "echo"
1141 Version v1.7.6-rc2; changes since v1.7.6-rc1:
1142 ---------------------------------------------
1144 Jonathan Nieder (1):
1145 gitweb: do not misparse nonnumeric content tag files that contain a digit
1151 Version v1.7.6-rc1; changes since v1.7.6-rc0:
1152 ---------------------------------------------
1155 t3703: skip more tests using colons in file names on Windows
1158 t7508: demonstrate status's failure to use --porcelain format with -z
1159 builtin/commit.c: set status_format _after_ option parsing
1162 gitweb: Move information about installation from README to INSTALL
1163 gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL
1164 gitweb: Move "Requirements" up in gitweb/INSTALL
1165 gitweb: Fix usability of $prevent_xss
1168 diff_tree: disable QUICK optimization with diff filter
1171 fetch: do not leak a refspec
1174 diff: futureproof "stop feeding the backend early" logic
1178 Version v1.7.6-rc0; changes since v1.7.5.4:
1179 -------------------------------------------
1182 Do not strip empty lines / trailing spaces from a commit message template
1184 Carlos Martín Nieto (1):
1185 log: convert to parse-options
1188 Use a temporary index for git commit --interactive
1189 Allow git commit --interactive with paths
1190 Add support for -p/--patch to git-commit
1191 Add commit to list of config.singlekey commands
1192 Test atomic git-commit --interactive
1195 rebase: create HEAD reflog entry when aborting
1198 Share color list between graph and show-branch
1199 http: make curl callbacks match contracts from curl header
1200 http-push: use const for strings in signatures
1201 http-push: refactor curl_easy_setup madness
1204 t6022: New test checking for unnecessary updates of renamed+modified files
1205 t6022: New test checking for unnecessary updates of files in D/F conflicts
1206 merge-recursive: When we detect we can skip an update, actually skip it
1209 strbuf: make sure buffer is zero-terminated
1210 config: support values longer than 1023 bytes
1213 test that git status works with merge conflict in, .gitmodules
1216 hashcmp(): inline memcmp() by hand to optimize
1218 Jakub Narebski (13):
1219 gitweb: Restructure projects list generation
1220 gitweb: Change the way "content tags" ('ctags') are handled
1221 gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)
1222 gitweb: Split JavaScript for maintability, combining on build
1223 gitweb.js: Update and improve comments in JavaScript files
1224 gitweb.js: Provide default values for padding in padLeftStr and padLeft
1225 gitweb.js: Extract and improve datetime handling
1226 gitweb.js: Introduce code to handle cookies from JavaScript
1227 gitweb.js: Provide getElementsByClassName method (if it not exists)
1228 gitweb: Refactor generating of long dates into format_timestamp_html
1229 gitweb: Unify the way long timestamp is displayed
1230 gitweb: Make JavaScript ability to adjust timezones configurable
1231 gitweb: Refactor reading and parsing config file into read_config_file
1234 "git log -h": typofix misspelled 'suppress'
1235 Add log.abbrevCommit config variable
1238 notes: make expand_notes_ref globally accessible
1239 revision.c: refactor notes ref expansion
1240 notes: refactor display notes extra refs field
1241 notes: refactor display notes default handling
1242 revision.c: support --notes command-line option
1243 revision.c: make --no-notes reset --notes list
1244 format-patch: wrap email addresses after long names
1245 add tests for various blame formats
1246 blame: refactor porcelain output
1247 blame: add --line-porcelain output format
1248 t7501.8: feed a meaningful command
1249 fetch: avoid repeated commits in mark_complete
1250 Makefile: sort TEST_PROGRAMS list
1251 refactor refs_from_alternate_cb to allow passing extra data
1252 bisect: refactor sha1_array into a generic sha1 list
1253 receive-pack: eliminate duplicate .have refs
1254 doc: discuss textconv versus external diff drivers
1255 remote: allow "-t" with fetch mirrors
1256 read_in_full: always report errors
1257 t: test subject handling in format-patch / am pipeline
1258 mailinfo: always clean up rfc822 header folding
1259 pretty: add pp_commit_easy function for simple callers
1260 clean up calling conventions for pretty.c functions
1261 format-patch: preserve subject newlines with -k
1262 rebase: write a reflog entry when finishing
1263 format-patch: make zero-length subject prefixes prettier
1266 Submodules: Don't parse .gitmodules when it contains, merge conflicts
1267 unpack-trees: add the dry_run flag to unpack_trees_options
1268 Teach read-tree the -n|--dry-run option
1271 diffcore-rename.c: avoid set-but-not-used warning
1272 plug a DIR buffer leak in rerere.c
1275 log/pretty-options: Document --[no-]notes and deprecate old notes options
1276 Make "git notes add" more user-friendly when there are existing notes
1277 Add several testcases for --dirstat and friends
1278 Make --dirstat=0 output directories that contribute < 0.1% of changes
1279 Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file
1280 Add config variable for specifying default --dirstat behavior
1281 Allow specifying --dirstat cut-off percentage as a floating point number
1282 New --dirstat=lines mode, doing dirstat analysis based on diffstat
1283 Improve error handling when parsing dirstat parameters
1284 Mark dirstat error messages for translation
1287 t3703: Skip tests using directory name ":" on Windows
1288 Tweak t3102-ls-tree-wildcards to run on Windows
1289 Windows: add a wrapper for the shutdown() system call
1291 John 'Warthog9' Hawley (2):
1292 gitweb: JavaScript ability to adjust time based on timezone
1293 gitweb.js: Add UI for selecting common timezone to display dates
1296 git: add --info-path and --man-path options
1298 Jonathan Nieder (15):
1299 revisions: split out handle_revision_pseudo_opt function
1300 revisions: allow --glob and friends in parse_options-enabled commands
1301 Documentation: clarify meaning of --html-path, --man-path, and --info-path
1302 tests: eliminate unnecessary setup test assertions
1303 tests: teach verify_parents to check for extra parents
1304 tests: check git does not barf on merge.ff values for future versions of git
1305 completion: move private shopt shim for zsh to __git_ namespace
1306 t4018 (funcname patterns): make .gitattributes state easier to track
1307 t4018 (funcname patterns): make configuration easier to track
1308 t4018 (funcname patterns): minor cleanups
1309 userdiff/perl: anchor "sub" and "package" patterns on the left
1310 userdiff/perl: match full line of POD headers
1311 userdiff/perl: catch sub with brace on second line
1312 tests: make test_expect_code quieter on success
1313 userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters
1315 Junio C Hamano (53):
1316 merge-recursive: tweak magic band-aid
1317 git diff -D: omit the preimage of deletes
1318 pathspec: rename per-item field has_wildcard to use_wildcard
1319 magic pathspec: add tentative ":/path/from/top/level" pathspec support
1320 merge: allow "-" as a short-hand for "previous branch"
1321 magic pathspec: futureproof shorthand form
1322 magic pathspec: add ":(icase)path" to match case insensitively
1324 Update draft release notes to 1.7.6
1325 Update draft release notes to 1.7.6
1326 Update draft release notes to 1.7.6
1327 Update draft release notes to 1.7.6
1328 merge: introduce merge.ff configuration variable
1329 rerere: libify rerere_clear() and rerere_gc()
1330 index_fd(): turn write_object and format_check arguments into one flag
1331 index_fd(): split into two helper functions
1332 convert: rename the "eol" global variable to "core_eol"
1333 convert: give saner names to crlf/eol variables, types and functions
1334 convert: make it safer to add conversion attributes
1335 convert: make it harder to screw up adding a conversion attribute
1336 git-grep: do not die upon -F/-P when grep.extendedRegexp is set.
1337 Revert "magic pathspec: add ":(icase)path" to match case insensitively"
1338 pathspec: drop "lone : means no pathspec" from get_pathspec()
1339 grep: use get_pathspec() correctly
1340 fix overstrict :<path> diagnosis
1341 fix overslow :/no-such-string-ever-existed diagnostics
1342 rev/path disambiguation: further restrict "misspelled index entry" diag
1343 Revert "completion: don't declare 'local words' to make zsh happy"
1344 Update draft release notes to 1.7.6
1345 revision.c: leave a note for "a lone :" enhancement
1346 Update draft release notes to 1.7.6
1347 Bigfile: teach "git add" to send a large file straight to a pack
1348 Declare lookup_replace_object() in cache.h, not in commit.h
1349 t6050: make sure we test not just commit replacement
1350 read_sha1_file(): get rid of read_sha1_file_repl() madness
1351 inline lookup_replace_object() calls
1352 read_sha1_file(): allow selective bypassing of replacement mechanism
1353 Sync release notes for 1.7.6 to exclude what are in maintenance track
1354 git-grep: update tests now regexp type is "last one wins"
1355 Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS
1356 Update release notes to 1.7.6
1357 notes remove: allow removing more than one
1358 notes remove: --ignore-missing
1359 notes remove: --stdin reads from the standard input
1360 show: --ignore-missing
1361 Revert "Merge branch 'en/merge-recursive'"
1362 Update draft release notes to 1.7.6
1363 Update 1.7.6 draft release notes
1364 require-work-tree wants more than what its name says
1365 compat/fnmatch/fnmatch.c: give a fall-back definition for NULL
1366 Update 1.7.6 draft release notes
1367 log: --quiet should serve as synonym to -s
1368 Update draft release notes to 1.7.6
1371 git-p4: add option to preserve user names
1372 git-p4: small improvements to user-preservation
1373 git-p4: warn if git authorship won't be retained
1375 Marius Storm-Olsen (1):
1376 Automatically autoload bashcompinit for ZSH, when needed
1378 Martin von Zweigbergk (34):
1379 rebase: clearer names for directory variables
1380 rebase: refactor reading of state
1381 rebase: read state outside loop
1382 rebase: remove unused rebase state 'prev_head'
1383 rebase: improve detection of rebase in progress
1384 rebase: act on command line outside parsing loop
1385 rebase: stricter check of standalone sub command
1386 rebase: align variable names
1387 rebase: align variable content
1388 rebase: factor out command line option processing
1389 rebase -i: remove now unnecessary directory checks
1390 rebase: reorder validation steps
1391 rebase: factor out reference parsing
1392 rebase: factor out clean work tree check
1393 rebase: factor out call to pre-rebase hook
1394 rebase -i: support --stat
1395 rebase: remove $branch as synonym for $orig_head
1396 rebase: extract merge code to new source file
1397 rebase: extract am code to new source file
1398 rebase: show consistent conflict resolution hint
1399 rebase -i: align variable names
1400 rebase: make -v a tiny bit more verbose
1401 rebase: factor out sub command handling
1402 rebase: extract code for writing basic state
1403 rebase: remember verbose option
1404 rebase: remember strategy and strategy options
1405 rebase -m: remember allow_rerere_autoupdate option
1406 rebase -m: don't print exit code 2 when merge fails
1407 git-rebase--am: remove unnecessary --3way option
1408 rebase -i: don't read unused variable preserve_merges
1409 rebase -i: remove unnecessary state rebase-root
1410 rebase: use @{upstream} if no upstream specified
1411 Makefile: do not install sourced rebase scripts
1412 rebase: define options in OPTIONS_SPEC
1414 Mathias Lafeldt (1):
1415 t/test-lib.sh: minor readability improvements
1417 Michael Haggerty (1):
1418 git-svn: add an option to skip the creation of empty directories
1420 Michael J Gruber (7):
1421 contrib/completion: --notes, --no-notes
1422 rev-list --count: separate count for --cherry-mark
1423 t1020: test !alias in subdirectory
1424 handle_alias: provide GIT_PREFIX to !alias
1425 config: define and document exit codes
1426 config: Give error message when not changing a multivar
1427 sh-18n: quell "unused variable" warning
1429 Michael Schubert (2):
1430 tag: disallow '-' as tag name
1431 ls-remote: the --exit-code option reports "no matching refs"
1433 Michał Kiedrowicz (11):
1434 Documentation: Add --line-number to git-grep synopsis
1435 contrib/completion: --line-number to git grep
1436 grep: Put calls to fixmatch() and regmatch() into patmatch()
1437 grep: Fix a typo in a comment
1438 grep: Extract compile_regexp_failed() from compile_regexp()
1439 git-grep: Learn PCRE
1440 configure: Check for libpcre
1441 grep: Add basic tests
1442 git-grep: Bail out when -P is used with -F or -E
1443 git-grep: Update tests (mainly for -P)
1444 git-grep: Fix problems with recently added tests
1447 blame: add --abbrev command line option and make it honor core.abbrev
1449 Nguyễn Thái Ngọc Duy (8):
1450 Reimplement read_tree_recursive() using tree_entry_interesting()
1451 Convert read_tree{,_recursive} to support struct pathspec
1452 Improve tree_entry_interesting() handling code
1453 setup: return correct prefix if worktree is '/'
1454 Kill off get_relative_cwd()
1455 t1011: fix sparse-checkout initialization and add new file
1456 sparse checkout: do not eagerly decide the fate for whole directory
1457 t3703, t4208: add test cases for magic pathspec
1459 Nicolas Morey-Chaisemartin (1):
1460 submodule: Add --force option for git submodule update
1462 Rafael Gieschke (1):
1463 ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd
1465 Ramsay Allan Jones (9):
1466 Makefile: Use cgcc rather than sparse in the check target
1467 sparse: Fix an "symbol 'cmd_index_pack' not declared" warning
1468 sparse: Fix some "Using plain integer as NULL pointer" warnings
1469 sparse: Fix an "symbol 'format_subject' not declared" warning
1470 sparse: Fix an "symbol 'merge_file' not decared" warning
1471 sparse: Fix errors due to missing target-specific variables
1472 sparse: Fix some "symbol not declared" warnings
1473 setup.c: Fix some "symbol not declared" sparse warnings
1474 config.c: Remove unused git_config_global() function
1477 strbuf: clarify assertion in strbuf_setlen()
1480 completion: don't modify the $cur variable in completion functions
1481 completion: remove unnecessary _get_comp_words_by_ref() invocations
1482 completion: don't declare 'local words' to make zsh happy
1484 Sebastien Cevey (3):
1485 gitweb: Split git_project_list_body in two functions
1486 gitweb: Modularized git_get_project_description to be more generic
1487 gitweb: Optional grouping of projects by category
1490 t5541-http-push: add test for chunked
1492 Ævar Arnfjörð Bjarmason (5):
1493 git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()
1494 git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers
1495 git-sh-i18n.sh: add GIT_GETTEXT_POISON support
1496 Makefile: add xgettext target for *.sh files
1497 git-sh-i18n--envsubst: add SYNOPSIS section to the documentation
1500 Version v1.7.5.4; changes since v1.7.5.3:
1501 -----------------------------------------
1504 Documentation/technical/api-diff.txt: correct name of diff_unmerge()
1505 git-submodule.sh: separate parens by a space to avoid confusing some shells
1508 config: make environment parsing routines static
1509 git_config: don't peek at global config_parameters
1510 config: always parse GIT_CONFIG_PARAMETERS during git_config
1511 read_gitfile_gently: use ssize_t to hold read result
1512 docs: minor grammar fixes to git-status
1513 docs: update status --porcelain format
1514 docs: make sure literal "->" isn't converted to arrow
1515 docs: fix some antique example output
1518 rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
1519 remove tests of always-false condition
1520 diffcore-rename.c: avoid set-but-not-used warning
1522 Jonathan Nieder (3):
1523 tests: check error message from run_command
1524 run-command: handle short writes and EINTR in die_child
1525 Documentation: do not misinterpret refspecs as bold text
1527 Junio C Hamano (26):
1528 builtin/diff.c: remove duplicated call to diff_result_code()
1529 diffcore-rename: refactor "too many candidates" logic
1530 diffcore-rename: record filepair for rename src
1531 diffcore-rename: fall back to -C when -C -C busts the rename limit
1532 i18n: do not overuse C_LOCALE_OUTPUT
1533 i18n: .git file is not a human readable message (t5601)
1534 i18n: use test_i18ncmp in t1200 and t2200
1535 i18n: do not overuse C_LOCALE_OUTPUT (grep)
1536 i18n: use test_i18ngrep in lib-httpd and t2019
1537 i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
1538 i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
1539 i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
1540 i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
1541 i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
1542 i18n: use test_i18ngrep in t7201
1543 i18n: use test_i18ncmp in t7500
1544 i18n: use test_i18ngrep in t7501
1545 i18n: use test_i18ngrep and test_i18ncmp in t7502
1546 i18n: use test_i18ngrep in t7506
1547 i18n: use test_i18n{grep,cmp} in t7508
1548 i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
1549 handle_options(): do not miscount how many arguments were used
1550 userformat_find_requirements(): find requirement for the correct format
1551 config.mak.in: allow "configure --sysconfdir=/else/where"
1552 Start 1.7.5.4 draft release notes
1555 Mathias Lafeldt (1):
1556 t/README: unify documentation of test function args
1558 Ramkumar Ramachandra (4):
1559 Documentation: Add filter.<driver>.* to config
1560 Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
1561 Documentation: Add diff.<driver>.* to config
1562 Documentation: Allow custom diff tools to be specified in 'diff.tool'
1565 add -i: ignore terminal escape sequences
1567 Valentin Haenel (5):
1568 config.txt: 'interactive.singlekey; is used by...
1569 git-add.txt: document 'interactive.singlekey'
1570 git-stash.txt: better docs for '--patch'
1571 git-checkout.txt: better docs for '--patch'
1572 git-reset.txt: better docs for '--patch'
1574 Ævar Arnfjörð Bjarmason (7):
1575 i18n: mark merge "Could not read from" message for translation
1576 i18n: mark merge "upstream" messages for translation
1577 i18n: mark merge CHERRY_PICK_HEAD messages for translation
1578 i18n: mark clone nonexistent repository message for translation
1579 i18n: mark checkout --detach messages for translation
1580 i18n: mark checkout plural warning for translation
1581 i18n: mark init-db messages for translation
1584 Version v1.7.5.3; changes since v1.7.5.2:
1585 -----------------------------------------
1587 Felipe Contreras (1):
1588 git-completion: fix regression in zsh support
1590 Fraser Tweedale (1):
1591 gitweb: supply '-n' to gzip for identical output
1594 send-pack: unbreak push over stateless rpc
1595 cherry-pick: handle root commits with external strategies
1596 revert: allow reverting a root commit
1597 t3503: test cherry picking and reverting root commits
1598 connect: treat generic proxy processes like ssh processes
1599 connect: let callers know if connection is a socket
1600 send-pack: avoid deadlock on git:// push with failed pack-objects
1601 test core.gitproxy configuration
1604 do not read beyond end of malloc'd buffer
1607 Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird
1608 send-pack: avoid deadlock when pack-object dies early
1609 Honor $(prefix) set in config.mak* when defining ETC_GIT*
1611 Jonathan Nieder (5):
1612 Revert "t0081 (line-buffer): add buffering tests"
1613 Documentation: explain how to check for patch corruption
1614 Documentation: hints for sending patches inline with Thunderbird
1615 Documentation: publicize KMail hints for sending patches inline
1616 Documentation: publicize hints for sending patches with GMail
1619 Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir"
1620 setup_revisions(): take pathspec from command line and --stdin correctly
1621 sideband_demux(): fix decl-after-stmt
1625 Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
1627 Michael J Gruber (2):
1628 config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
1629 git-svn: Fix git svn log --show-commit
1631 Nguyễn Thái Ngọc Duy (1):
1632 init/clone: remove short option -L and document --separate-git-dir
1634 Rafael Gieschke (1):
1635 copy_gecos: fix not adding nlen to len when processing "&"
1637 Stefan Sperling (1):
1638 remove noise and inaccuracies from git-svn docs
1641 Version v1.7.5.2; changes since v1.7.5.1:
1642 -----------------------------------------
1645 git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
1647 Brian Gernhardt (1):
1648 t/annotate-tests: Use echo & cat instead of sed
1650 Carlos Martín Nieto (2):
1651 format-patch: don't pass on the --quiet flag
1652 format-patch: document --quiet option
1655 Pass empty file to p4merge where no base is suitable.
1658 shell: add missing initialization of argv0_path
1661 Look for password in both CVS and CVSNT password files.
1664 git-instaweb: Simplify build dependency on gitweb
1665 Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
1668 pretty: quote rfc822 specials in email addresses
1669 add tests for merge-index / merge-one-file
1670 merge-one-file: fix broken merges with alternate work trees
1673 Documentation/git-fsck.txt: fix typo: unreadable -> unreachable
1676 t5400: Fix a couple of typos
1678 Jonathan Nieder (4):
1679 Restructure documentation for git-merge-base.
1680 Documentation: describe the format of messages with inline patches
1681 add, merge, diff: do not use strcasecmp to compare config variable names
1682 provide a copy of the LGPLv2.1
1685 mergetool: Teach about submodules
1688 blame: tolerate bogus e-mail addresses a bit better
1691 Remove duplicated "is a"
1693 Junio C Hamano (19):
1694 test: use $_z40 from test-lib
1695 diff.c: return filepair from diff_unmerge()
1696 diff: remove often unused parameters from diff_unmerge()
1697 diff-files: show unmerged entries correctly
1698 Fix "add -u" that sometimes fails to resolve unmerged paths
1699 add -p: 'q' should really quit
1700 t3701: Editing a split hunk in an "add -p" session
1701 add--interactive.perl: factor out repeated --recount option
1702 "add -p": work-around an old laziness that does not coalesce hunks
1703 t3701: fix here document
1704 merge: make branch.<name>.mergeoptions correctly override merge.<option>
1705 t3701: add-p-fix makes the last test to pass
1706 t1507: avoid "${parameter<op>'word'}" inside double-quotes
1709 git_open_noatime(): drop unused parameter
1710 Update draft release notes to 1.7.5.2
1711 Update draft release notes to 1.7.5.2
1714 Martin von Zweigbergk (1):
1715 diffcore-rename: don't consider unmerged path as source
1717 Michael J Gruber (1):
1718 git-fast-import.txt: --relative-marks takes no parameter
1720 Sebastian Schuberth (1):
1721 doc: Clarify that "cherry-pick -x" does not use "git notes"
1723 Sverre Rabbelier (1):
1724 fast-import: fix option parser for no-arg options
1726 Valentin Haenel (3):
1727 git-svn.txt: fix usage of --add-author-from
1728 git-svn.txt: move option descriptions
1729 git-svn.txt: small typeface improvements
1731 Vincent van Ravesteijn (1):
1732 Documentation: update to git-merge-base --octopus
1735 Version v1.7.5.1; changes since v1.7.5:
1736 ---------------------------------------
1739 clean: unreadable directory may still be rmdir-able if it is empty
1742 stash: add two more tests for --no-keep-index
1743 stash: ensure --no-keep-index and --patch can be used in any order
1746 stash: fix accidental apply of non-existent stashes
1747 stash: drop dirty worktree check on apply
1748 upload-pack: start pack-objects before async rev-list
1751 --dirstat: Describe non-obvious differences relative to --stat or regular diff
1752 --dirstat-by-file: Make it faster and more correct
1753 Teach --dirstat not to completely ignore rearranged lines within a file
1754 --dirstat: In case of renames, use target filename instead of source filename
1757 stash: fix false positive in the invalid ref test.
1760 Teach core.bigfilethreashold to pack-objects
1761 http: clear POSTFIELDS when initializing a slot
1762 Start 1.7.5.1 maintenance track
1765 Michael J Gruber (6):
1766 builtin/log.c: separate default and setup of cmd_log_init()
1767 t/t1411: test reflog with formats
1768 reflog: fix overriding of command line options
1769 t1506: factor out test for "Did you mean..."
1770 sha1_name: Suggest commit:./file for path in subdir
1771 date: avoid "X years, 12 months" in relative dates
1774 git-send-email: fix missing space in error message
1776 Valentin Haenel (1):
1777 git-add.txt: document 'add.ignoreErrors'
1780 Version v1.7.5; changes since v1.7.5-rc3:
1781 -----------------------------------------
1787 Version v1.7.5-rc3; changes since v1.7.5-rc2:
1788 ---------------------------------------------
1791 Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"
1795 Michael J Gruber (3):
1796 git.txt: fix list continuation
1797 t3306,t5304: avoid clock skew issues
1798 git-svn.txt: Document --mergeinfo
1801 archive: document limitation of tar.umask config setting
1804 Version v1.7.5-rc2; changes since v1.7.5-rc1:
1805 ---------------------------------------------
1807 Alejandro R. Sedeño (1):
1808 git-svn: Add a svn-remote.<name>.pushurl config key
1811 gitk: Take only numeric version components when computing $git_version
1812 gitk: Update cherry-pick error message parsing
1815 git-p4: replace each tab with 8 spaces for consistency
1818 git-svn: Cache results of running the executable "git config"
1821 remove doubled words, e.g., s/to to/to/, and fix related typos
1824 t0001: guard a new test with SYMLINKS prerequisite
1825 t2021: mark a test as fixed
1831 gitk: Quote tag names in event bindings to avoid problems with % chars
1834 gitk: Allow user to control how much of the SHA1 ID gets auto-selected
1836 Ramkumar Ramachandra (1):
1837 revert: Hide '-r' option in default usage
1839 Ramsay Allan Jones (1):
1840 i18n: avoid parenthesized string as array initializer
1843 gitk: spelling fixes in Russian translation
1845 Ævar Arnfjörð Bjarmason (1):
1846 Makefile: extract Q_() source strings as ngettext()
1849 Version v1.7.5-rc1; changes since v1.7.5-rc0:
1850 ---------------------------------------------
1853 Remove old binaries from .gitignore
1854 Fix two unused variable warnings in gcc 4.6
1857 gitweb: Fix parsing of negative fractional timezones in JavaScript
1860 merge: match the help text with the documentation
1863 merge: merge unborn index before setting ref
1864 pull: do not clobber untracked files on initial pull
1865 remote: disallow some nonsensical option combinations
1866 remote: separate the concept of push and fetch mirrors
1867 remote: deprecate --mirror
1868 docs: fix filter-branch subdir example for exotic repo names
1869 pull: do not clobber untracked files on initial pull
1872 fetch/pull: recurse into submodules when necessary
1873 fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
1874 config: teach the fetch.recurseSubmodules option the 'on-demand' value
1875 Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
1876 fetch/pull: Don't recurse into a submodule when commits are already present
1877 submodule update: Don't fetch when the submodule commit is already present
1878 fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
1881 grep: allow -E and -n to be turned on by default via configuration
1883 Jonathan Nieder (1):
1884 compat: add missing #include <sys/resource.h>
1887 merge: merge with the default upstream branch without argument
1888 "log --cherry-pick" documentation regression fix
1889 Doc: mention --delta-base-offset is the default for Porcelain commands
1891 Update release notes
1892 Start preparing for 1.7.4.4
1896 Lawrence Mitchell (1):
1897 git.el: Don't use font-lock-compile-keywords
1899 Michael J Gruber (3):
1900 revisions.txt: consistent use of quotes
1901 revisions.txt: structure with a labelled list
1902 revisions.txt: language improvements
1904 Nguyễn Thái Ngọc Duy (2):
1905 git-init.txt: move description section up
1906 init, clone: support --separate-git-dir for .git file
1908 Nicolas Morey-Chaisemartin (1):
1909 submodule: process conflicting submodules only once
1912 Documentation: trivial grammar fix in core.worktree description
1915 Makefile: Cover more files with make check
1916 sparse: Fix errors and silence warnings
1918 Ævar Arnfjörð Bjarmason (70):
1919 i18n: git-init basic messages
1920 i18n: git-init "Initialized [...] repository" message
1921 i18n: git-clone basic messages
1922 i18n: git-clone "Cloning into" message
1923 i18n: git-clone "Cloning into" message
1924 i18n: git-add basic messages
1925 i18n: git-add "The following paths are ignored" message
1926 i18n: git-add "did not match any files" message
1927 i18n: git-add "remove '%s'" message
1928 i18n: git-add "Unstaged changes" message
1929 i18n: git-branch basic messages
1930 i18n: git-branch "remote branch '%s' not found" message
1931 i18n: git-branch "Deleted branch [...]" message
1932 i18n: git-branch "git branch -v" messages
1933 i18n: git-branch "(no branch)" message
1934 i18n: git-checkout basic messages
1935 i18n: git-checkout: our/their version message
1936 i18n: git-checkout describe_detached_head messages
1937 i18n: git-checkout "HEAD is now at" message
1938 i18n: git-checkout "Switched to a .. branch" message
1939 i18n: git-commit basic messages
1940 i18n: git-commit "middle of a merge" message
1941 i18n: git-commit formatting messages
1942 i18n: git-commit print_summary messages
1943 i18n: git-commit "enter the commit message" message
1944 i18n: git-commit advice messages
1945 i18n: git-diff basic messages
1946 i18n: git-fetch basic messages
1947 i18n: git-fetch formatting messages
1948 i18n: git-fetch update_local_ref messages
1949 i18n: git-fetch split up "(non-fast-forward)" message
1950 i18n: git-grep basic messages
1951 i18n: git-grep "--open-files-in-pager" message
1952 i18n: git-log basic messages
1953 i18n: git-log "--OPT does not make sense" messages
1954 i18n: git-merge basic messages
1955 i18n: git-merge "Updating %s..%s" message
1956 i18n: git-merge "You have not concluded your merge" messages
1957 i18n: git-merge "Wonderful" message
1958 i18n: git-mv basic messages
1959 i18n: git-mv "bad" messages
1960 i18n: git-rm basic messages
1961 i18n: git-reset basic messages
1962 i18n: git-reset reset_type_names messages
1963 i18n: git-reset "Unstaged changes after reset" message
1964 i18n: git-tag basic messages
1965 i18n: git-tag tag_template message
1966 i18n: git-push basic messages
1967 i18n: git-push "prevent you from losing" message
1968 i18n: git-status basic messages
1969 i18n: git-status "nothing to commit" messages
1970 i18n: git-status shortstatus messages
1971 i18n: git-status "Changes to be committed" message
1972 i18n: git-status "Initial commit" message
1973 i18n: git-status "renamed: " message
1974 i18n: git-archive basic messages
1975 i18n: git-bundle basic messages
1976 i18n: git-clean basic messages
1977 i18n: git-clean clean.requireForce messages
1978 i18n: git-describe basic messages
1979 i18n: git-gc basic messages
1980 i18n: git-gc "Auto packing the repository" message
1981 i18n: git-notes basic commands
1982 i18n: git-notes GIT_NOTES_REWRITE_MODE error message
1983 i18n: git-revert basic messages
1984 i18n: git-revert "Your local changes" message
1985 i18n: git-revert literal "me" messages
1986 i18n: git-revert split up "could not revert/apply" message
1987 i18n: git-shortlog basic messages
1988 t2019-checkout-ambiguous-ref.sh: depend on C_LOCALE_OUTPUT
1991 Version v1.7.5-rc0; changes since v1.7.4.5:
1992 -------------------------------------------
1995 git-gui: update russian translation
1996 git-gui: update russian translation
1998 Alexandre Erwin Ittner (1):
1999 git-gui: add Brazilian Portuguese (pt-BR) translation
2002 git-gui: fix ANSI-color parsing
2003 git-gui: respect conflict marker size
2004 git-gui: fix browsers [Up To Parent] in sub-sub-directories.
2005 git-gui: Fix use of renamed tag.
2006 git-gui: Fix use of hunk tag for non-hunk content.
2007 git-gui: fix typo in image data
2008 git-gui: remove 'no such variable' for s error when encounter unknown file states
2009 git-gui: learn more type change states
2010 git-gui: rework handling of diff header
2011 git-gui: handle index lines only in the diff header
2012 git-gui: name also new symlinks so
2013 git-gui: there is no "mode *" diff header line
2014 git-gui: move 3way diff autodetect up
2015 git-gui: always reset the current tag
2016 git-gui: handle special content lines only in the diff header section
2017 git-gui: handle meta diff header lines only in the header section
2019 Carlo Marcelo Arenas Belon (1):
2020 setup: translate symlinks in filename when using absolute paths
2022 Carlos Martín Nieto (1):
2023 Name make_*_path functions more accurately
2026 vcs-svn: Allow simple v3 dumps (no deltas yet)
2027 vcs-svn: Implement Prop-delta handling
2028 fast-import: add 'ls' command
2029 vcs-svn: use strbuf for revision log
2030 vcs-svn: use strbuf for author, UUID, and URL
2031 vcs-svn: implement perfect hash for node-prop keys
2032 vcs-svn: implement perfect hash for top-level keys
2033 vcs-svn: use strchr to find RFC822 delimiter
2036 Documentation: "rebase <onto> <that>" stays on <that> branch upon exit
2039 Make rev-list --objects work together with pathspecs
2040 Add testcases showing how pathspecs are handled with rev-list --objects
2043 alias: use run_command api to execute aliases
2045 Giuseppe Bilotta (1):
2046 Improve test for pthreads flag
2049 git gui: keep selected branch when remote is changed in push dialog
2050 git-gui: scroll down to default selection for push dialog
2051 git-gui: instead of defaulting to home directory use working directory
2052 mingw: move unlink wrapper to mingw.c
2053 mingw: work around irregular failures of unlink on windows
2054 mingw: make failures to unlink or move raise a question
2055 mingw: add fallback for rmdir in case directory is in use
2056 git-gui: fix deleting item from all_remotes variable
2057 git-gui: always default to the last merged branch in remote delete
2058 git-gui: refactor remote submenu creation into subroutine
2059 git-gui: teach fetch/prune menu to do it for all remotes
2060 git-gui: fetch/prune all entry only for more than one entry
2061 git-gui: fetch/prune all entry appears last
2064 Obey p4 views when using client spec
2067 object.h: Remove obsolete struct object_refs
2068 git-completion: Add git help completion for aliases
2071 gitweb: Make i18n (encoding) tests in t9500 leave clean state
2074 git-checkout.txt: improve detached HEAD documentation
2075 Introduce CHERRY_PICK_HEAD
2076 bash: teach __git_ps1 about CHERRY_PICK_HEAD
2077 Teach commit about CHERRY_PICK_HEAD
2080 merge: improve inexact rename limit warning
2081 bump rename limit defaults (again)
2082 commit: stop setting rename limit
2083 add inexact rename detection progress infrastructure
2084 merge: enable progress reporting for rename detection
2085 pull: propagate --progress to merge
2086 compat: provide a fallback va_copy definition
2087 strbuf: add strbuf_vaddf
2088 trace: add trace_vprintf
2089 trace: refactor to support multiple env variables
2090 trace: factor out "do we want to trace" logic
2091 trace: add trace_strbuf
2092 add packet tracing debug code
2093 trace: give repo_setup trace its own key
2094 doc: drop author/documentation sections from most pages
2095 doc: add missing git footers
2096 docs: point git.txt author credits to git-scm.com
2097 checkout: add basic tests for detached-orphan warning
2098 checkout: clear commit marks after detached-orphan check
2099 checkout: tweak detached-orphan warning format
2100 t7607: mark known breakage in test 11 as fixed
2101 t7607: clean up stray untracked file
2102 tests: kill backgrounded processes more robustly
2105 tests: fix overeager scrubbing of environment variables
2107 Johannes Schindelin (2):
2108 mingw_rmdir: set errno=ENOTEMPTY when appropriate
2109 Remove unused variables
2112 rerere forget: deprecate invocation without pathspec
2114 Jonathan Nieder (75):
2115 vcs-svn: Check for errors from open()
2116 vcs-svn: Eliminate node_ctx.srcRev global
2117 vcs-svn: Eliminate node_ctx.mark global
2118 vcs-svn: Unclutter handle_node by introducing have_props var
2119 vcs-svn: Use mark to indicate nodes with included text
2120 vcs-svn: handle_node: Handle deletion case early
2121 vcs-svn: Replace = Delete + Add
2122 vcs-svn: Combine repo_replace and repo_modify functions
2123 vcs-svn: Delay read of per-path properties
2124 vcs-svn: Reject path nodes without Node-action
2125 vcs-svn: More dump format sanity checks
2126 vcs-svn: Make source easier to read on small screens
2127 vcs-svn: Split off function for handling of individual properties
2128 vcs-svn: Sharpen parsing of property lines
2129 vcs-svn: Allow change nodes for root of tree (/)
2130 cherry-pick/revert: add support for -X/--strategy-option
2131 unpack-trees: handle lstat failure for existing directory
2132 unpack-trees: handle lstat failure for existing file
2133 userdiff: simplify word-diff safeguard
2134 t4034 (diff --word-diff): style suggestions
2135 glossary: define pathspec
2136 checkout: split off a function to peel away branchname arg
2137 checkout: rearrange update_refs_for_switch for clarity
2138 t3507: introduce pristine-detach helper
2139 checkout: add missing const to describe_detached_head
2140 update-index --refresh --porcelain: add missing const
2141 vcs-svn: eliminate global byte_buffer
2142 vcs-svn: replace buffer_read_string memory pool with a strbuf
2143 vcs-svn: collect line_buffer data in a struct
2144 vcs-svn: teach line_buffer to handle multiple input files
2145 vcs-svn: make test-line-buffer input format more flexible
2146 tests: give vcs-svn/line_buffer its own test script
2147 vcs-svn: tweak test-line-buffer to not assume line-oriented input
2148 t0081 (line-buffer): add buffering tests
2149 vcs-svn: add binary-safe read function
2150 vcs-svn: allow character-oriented input
2151 vcs-svn: allow input from file descriptor
2152 vcs-svn: teach line_buffer about temporary files
2153 fast-import: make code "-Wpointer-arith" clean
2154 vcs-svn: introduce repo_read_path to check the content at a path
2155 vcs-svn: handle_node: use repo_read_path
2156 vcs-svn: simplify repo_modify_path and repo_copy
2157 vcs-svn: allow input errors to be detected promptly
2158 compat: fall back on __va_copy if available
2159 wt-status: add helpers for printing wt-status lines
2160 commit: refer to commit template as s->fp
2161 commit, status: use status_printf{,_ln,_more} helpers
2162 i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set
2163 wt-status: add helpers for printing wt-status lines
2164 commit: refer to commit template as s->fp
2165 commit, status: use status_printf{,_ln,_more} helpers
2166 i18n: add stub Q_() wrapper for ngettext
2167 i18n: "make distclean" should clean up after "make pot"
2168 tests: stop worrying about obsolete environment variables
2169 tests: suppress system gitattributes
2170 gitattributes: drop support for GIT_ATTR_NOGLOBAL
2171 config: drop support for GIT_CONFIG_NOGLOBAL
2172 tests: scrub environment of GIT_* variables
2173 declare 1-bit bitfields to be unsigned
2174 vcs-svn: remove spurious semicolons
2175 mktag: avoid %td in format string
2176 unbreak and eliminate NO_C99_FORMAT
2177 run-command: prettify -D_FORTIFY_SOURCE workaround
2178 vcs-svn: improve support for reading large files
2179 vcs-svn: make buffer_skip_bytes return length read
2180 vcs-svn: make buffer_copy_bytes return length read
2181 vcs-svn: improve reporting of input errors
2182 tests: avoid nonportable {foo,bar} glob
2183 vcs-svn: make reading of properties binary-safe
2184 vcs-svn: remove buffer_read_string
2185 vcs-svn: avoid unnecessary copying of log message and author
2186 vcs-svn: handle log message with embedded NUL
2187 vcs-svn: add missing cast to printf argument
2188 vcs-svn: add missing cast to printf argument
2189 tests: make sure input to sed is newline terminated
2191 Junio C Hamano (29):
2192 unpack-trees.c: cosmetic fix
2193 unpack_trees(): skip trees that are the same in all input
2194 t4034 (diff --word-diff): add a minimum Perl drier test vector
2195 t6004: add pathspec globbing test for log family
2196 checkout: introduce --detach synonym for "git checkout foo^{commit}"
2197 Rename t2019 with typo "amiguous" that meant "ambiguous"
2198 Revert "unpack_trees(): skip trees that are the same in all input"
2199 grep --no-index: honor pathspecs correctly
2200 rev-list: --left/right-only are mutually exclusive
2201 commit: give final warning when reattaching HEAD to leave commits behind
2202 Start preparing release notes to 1.7.5
2203 Update Release Notes to 1.7.5
2204 Update draft release notes to 1.7.5
2205 refs_from_alternate: helper to use refs from alternates
2206 fetch-pack: objects in our alternates are available to us
2207 fetch-pack: factor out hardcoded handshake window size
2208 fetch-pack: progressively use larger handshake windows
2209 fetch-pack: use smaller handshake window for initial request
2210 Update drart release notes to 1.7.5
2211 Update draft release notes to 1.7.5
2212 rerere: make sure it works even in a workdir attached to a young repository
2213 Update draft release note to 1.7.5
2214 Revert "upload-pack: Implement no-done capability"
2215 Revert "fetch-pack: Implement no-done capability"
2216 enable "no-done" extension only when fetching over smart-http
2217 Fix potential local deadlock during fetch-pack
2218 enable "no-done" extension only when serving over smart-http
2219 Revert two "no-done" reverts
2223 gitweb: fix #patchNN anchors when path_info is enabled
2225 Martin von Zweigbergk (2):
2227 mergetool: don't skip modify/remove conflicts
2230 push: better error messages when push.default = tracking
2231 push: better error message when no remote configured
2233 Michael Horowitz (1):
2234 git-p4 submit: prevent 'Jobs' section from being removed from p4 change log
2236 Michael J Gruber (14):
2237 revlist.c: introduce --left/right-only for unsymmetric picking
2238 t6007: Make sure we test --cherry-pick
2239 rev-list: documentation and test for --left/right-only
2240 git-add: make -A description clearer vs. -u
2241 rev-list/log: factor out revision mark generation
2242 revision.c: introduce --cherry-mark
2243 rev-list: documentation and test for --cherry-mark
2244 log --cherry: a synonym
2245 t6007: test rev-list --cherry
2246 git-log: put space after commit mark
2247 RelNotes/1.7.5.txt: typo and language fixes
2248 t6009: use test_commit() from test-lib.sh
2249 revision.c: introduce --min-parents and --max-parents options
2250 rev-list --min-parents,--max-parents: doc, test and completion
2253 vcs-svn: a void function shouldn't try to return something
2255 Nguyễn Thái Ngọc Duy (22):
2257 diff-no-index: use diff_tree_setup_paths()
2258 Convert struct diff_options to use struct pathspec
2259 tree_entry_interesting(): remove dependency on struct diff_options
2260 Move tree_entry_interesting() to tree-walk.c and export it
2261 diff-tree: convert base+baselen to writable strbuf
2262 tree_entry_interesting(): refactor into separate smaller functions
2263 tree_entry_interesting(): support depth limit
2264 tree_entry_interesting(): fix depth limit with overlapping pathspecs
2265 tree_entry_interesting(): support wildcard matching
2266 tree_entry_interesting(): optimize wildcard matching when base is matched
2267 pathspec: add match_pathspec_depth()
2268 struct rev_info: convert prune_data to struct pathspec
2269 Convert ce_path_match() to use struct pathspec
2270 Convert ce_path_match() to use match_pathspec_depth()
2271 grep: convert to use struct pathspec
2272 grep: use match_pathspec_depth() for cache/worktree grepping
2273 grep: use writable strbuf from caller for grep_tree()
2274 grep: drop pathspec_matches() in favor of tree_entry_interesting()
2275 t7810: overlapping pathspecs and depth limit
2276 Make hash-object more robust against malformed objects
2277 git.c: reorder builtin command list
2280 transport-helper.c: fix check for (size_t < 0)
2283 git-gui: Include version check and test for tearoff menu entry
2284 git-gui: detect the use of MUI langauge packs on Windows
2288 git-p4: fix key error for p4 problem
2289 git-p4: add missing newline in initial import message
2290 git-p4: accommodate new move/delete type in p4
2291 git-p4: reinterpret confusing p4 message
2292 git-p4: better message for "git-p4 sync" when not cloned
2293 git-p4: decode p4 wildcard characters
2294 git-p4: support clone --bare
2295 git-p4: fix clone @all regression
2296 git-p4: test clone @all
2297 git-p4: fix sync new branch regression
2298 git-p4: test sync new branch
2300 Piotr Krukowiecki (1):
2301 Documentation: running test with --debug keeps "trash" directory
2303 Ramkumar Ramachandra (1):
2304 fast-import: Introduce --import-marks-if-exists
2307 repo-config: add deprecation warning
2308 grep: read patterns from stdin with -f -
2311 bash: fix misindented esac statement in __git_complete_file()
2312 bash: complete 'git diff ...branc<TAB>'
2314 Sebastian Schuberth (4):
2315 mergetool--lib: Sort tools alphabetically for easier lookup
2316 mergetool--lib: Add Beyond Compare 3 as a tool
2317 mergetool--lib: Sort tools alphabetically for easier lookup
2318 mergetool--lib: Add Beyond Compare 3 as a tool
2321 git-gui: fix russian translation typos
2323 Shawn O. Pearce (6):
2324 smart-http: Don't use Expect: 100-Continue
2325 smart-http: Really never use Expect: 100-continue
2326 fetch-pack: Finish negotation if remote replies "ACK %s ready"
2327 upload-pack: More aggressively send 'ACK %s ready'
2328 fetch-pack: Implement no-done capability
2329 upload-pack: Implement no-done capability
2332 git-gui: spelling fixes in russian translation
2335 git-gui: use --exclude-standard to check for untracked files
2341 Exhibit merge bug that clobbers index&WT
2342 t4034: bulk verify builtin word regex sanity
2345 git-p4: Teach gitConfig method about arguments.
2346 Teach git-p4 to ignore case in perforce filenames if configured.
2347 git-p4: Fix error message crash in P4Sync.commit.
2349 Uwe Kleine-König (2):
2350 get_remote_url(): use the same data source as ls-remote to get remote urls
2351 git-request-pull: open-code the only invocation of get_remote_url
2354 git-p4: Improve rename detection support
2355 git-p4: Add copy detection support
2357 Ævar Arnfjörð Bjarmason (4):
2358 gitignore: add test-mktemp to ignore list
2359 i18n: add no-op _() and N_() wrappers
2360 i18n: add GETTEXT_POISON to simulate unfriendly translator
2361 i18n: Makefile: "pot" target to extract messages marked for translation
2364 Version v1.7.4.5; changes since v1.7.4.4:
2365 -----------------------------------------
2368 t2021: mark a test as fixed
2371 "log --cherry-pick" documentation regression fix
2374 Michael J Gruber (3):
2375 git.txt: fix list continuation
2376 t3306,t5304: avoid clock skew issues
2377 git-svn.txt: Document --mergeinfo
2380 archive: document limitation of tar.umask config setting
2383 Version v1.7.4.4; changes since v1.7.4.3:
2384 -----------------------------------------
2387 git-instaweb: Change how gitweb.psgi is made runnable as standalone app
2388 gitweb: Fix parsing of negative fractional timezones in JavaScript
2391 strbuf: add fixed-length version of add_wrapped_text
2392 format-patch: wrap long header lines
2393 format-patch: rfc2047-encode newlines in headers
2394 pull: do not clobber untracked files on initial pull
2396 Jonathan Nieder (1):
2397 compat: add missing #include <sys/resource.h>
2400 list-objects.c: don't add an unparsed NULL as a pending tree
2401 Rename core.abbrevlength back to core.abbrev
2402 diff/status: refactor opportunistic index update
2403 update $GIT_INDEX_FILE when there are racily clean entries
2404 Start preparing for 1.7.4.4
2408 Sanity-check config variable names
2409 Disallow empty section and variable names
2412 Make the default abbrev length configurable
2415 log: fix --max-count when used together with -S or -G
2417 Michael J Gruber (2):
2418 git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting
2419 git-log.txt,rev-list-options.txt: put option blocks in proper order
2421 Nicolas Morey-Chaisemartin (1):
2422 submodule: process conflicting submodules only once
2425 Documentation: trivial grammar fix in core.worktree description
2428 Version v1.7.4.3; changes since v1.7.4.2:
2429 -----------------------------------------
2432 HOME must be set before calling git-init when creating test repositories
2434 Carlos Martín Nieto (1):
2435 Documentation/config.txt: make truth value of numbers more explicit
2437 Clemens Buchacher (1):
2438 do not overwrite untracked symlinks
2441 git-cvsimport.perl: Bail out right away when reading from the server fails
2444 docs: fix filter-branch subdir example for exotic repo names
2447 grep: Add the option '--line-number'
2450 branch/checkout --track: Ensure that upstream branch is indeed a branch
2453 Demonstrate breakage: checkout overwrites untracked symlink with directory
2454 stash: fix incorrect quoting in cleanup of temporary files
2455 stash: copy the index using --index-output instead of cp -p
2458 checkout: fix bug with ambiguous refs
2459 apply: do not patch lines that were already patched
2460 apply -v: show offset count when patch did not apply exactly
2461 diff --quiet: disable optimization when --diff-filter=X is used
2462 doc: technical details about the index file format
2463 t8001: check the exit status of the command being tested
2464 parse-remote: typofix
2465 Doc: mention --delta-base-offset is the default for Porcelain commands
2469 contrib/thunderbird-patch-inline: do not require bash to run the script
2471 Michael J Gruber (2):
2472 git-bisect.txt: streamline run presentation
2473 git-bisect.txt: example for bisecting with hot-fix
2476 git tag documentation grammar fixes and readability updates
2478 strbuf.h: remove a tad stale docs-in-comment and reference api-doc instead
2480 Nguyễn Thái Ngọc Duy (1):
2481 doc: technical details about the index file format
2483 Piotr Krukowiecki (2):
2484 git stash: show status relative to current directory
2485 Add test: git stash shows status relative to current dir
2488 parse-remote: replace unnecessary sed invocation
2489 git-pack-objects.txt: fix grammatical errors
2492 Version v1.7.4.2; changes since v1.7.4.1:
2493 -----------------------------------------
2496 diff format documentation: clarify --cc and -c
2499 Documentation: remove redundant colons in git-for-each-ref.txt
2500 Add Author and Documentation sections to git-for-each-ref.txt
2501 docs: fix grammar in gitattributes.txt
2504 Improve error messages when temporary file creation fails
2507 Work around broken ln on solaris as used in t8006
2509 Carlos Martín Nieto (3):
2510 valgrind: ignore SSE-based strlen invalid reads
2511 make_absolute_path: return the input path if it points to our buffer
2512 t/README: Add a note about running commands under valgrind
2514 Clemens Buchacher (1):
2515 Documentation: clarify -u<mode> option defaults
2518 branch_merged: fix grammar in warning
2521 mingw: add minimum getrlimit() compatibility stub
2524 gitweb: Always call parse_date with timezone parameter
2525 gitweb: Fix handling of fractional timezones in parse_date
2528 merge: honor prepare-commit-msg hook
2531 string_list_append: always set util pointer to NULL
2532 clone: die when trying to clone missing local path
2533 diff: handle diffstat of rewritten binary files
2534 diff: don't retrieve binary blobs for diffstat
2535 bisect: visualize with git-log if gitk is unavailable
2538 push.default: Rename 'tracking' to 'upstream'
2540 Jonathan Nieder (9):
2541 correct type of EMPTY_TREE_SHA1_BIN
2542 tests: skip terminal output tests on OS X
2543 commit: error out for missing commit message template
2544 enums: omit trailing comma for portability
2545 compat: make gcc bswap an inline function
2546 standardize brace placement in struct definitions
2547 branch: split off function that writes tracking info and commit subject
2548 cherry: split off function to print output lines
2549 diff --submodule: split into bite-sized pieces
2552 CodingGuidelines: downcase placeholders in usage messages
2553 verify-pack: add --stat-only to the synopsis section
2554 SubmittingPatches: clarify the expected commit log description
2555 Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"
2556 Prepare draft release notes to 1.7.4.2
2557 bisect: explain the rationale behind 125
2558 Update draft release notes to 1.7.4.2
2562 gitweb: highlight: replace tabs with spaces
2565 for_each_hash: allow passing a 'void *data' pointer to callback
2566 diffcore-rename: properly honor the difference between -M and -C
2567 diffcore-rename: improve estimate_similarity() heuristics
2569 Masatake Osanai (1):
2570 perl: command_bidi_pipe() method should set-up git environmens
2572 Mathias Lafeldt (1):
2573 Fix typo in t/README
2575 Michael J Gruber (16):
2576 commit,tag: use same wording for -F
2577 commit,status: describe --porcelain just like push
2578 clone,init: describe --template using the same wording
2579 commit,merge,tag: describe -m likewise
2580 add: describe --patch like checkout, reset
2581 commit,status: describe -u likewise
2582 git-tag.txt: list all modes in the description
2583 pull: do not display fetch usage on --help-all
2584 Make <identifier> lowercase as per CodingGuidelines
2585 Make <identifier> lowercase as per CodingGuidelines
2586 Make <identifier> lowercase as per CodingGuidelines
2587 Make <identifier> lowercase in Documentation
2588 git-patch-id: test for "no newline" markers
2589 git-patch-id: do not trip over "no newline" markers
2590 mergetool-lib: call vim in readonly mode for diffs
2591 rev-list-options.txt: typo fix
2594 Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section
2595 git-compat-util.h: Honor HP C's noreturn attribute
2597 Michał Kiedrowicz (1):
2598 Documentation: fix a typo in git-apply.txt
2600 Nguyễn Thái Ngọc Duy (2):
2601 parse_tag_buffer(): do not prefixcmp() out of range
2602 init: remove unnecessary check
2604 Piotr Krukowiecki (1):
2605 ls-remote documentation: <refs> argument is optional
2607 Ralf Wildenhues (1):
2608 configure: use AC_LANG_PROGRAM consistently
2611 git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'
2613 Shawn O. Pearce (2):
2614 Limit file descriptors used by packs
2615 sha1_file.c: Don't retain open fds on small packs
2617 Spencer E. Olson (2):
2618 submodule: no [--merge|--rebase] when newly cloned
2619 t7406: "git submodule update {--merge|--rebase]" with new submodules
2621 Ævar Arnfjörð Bjarmason (4):
2622 gitweb/gitweb.perl: remove use of qw(...) as parentheses
2623 gitweb/gitweb.perl: don't call S_ISREG() with undef
2624 t/gitweb-lib.sh: Ensure that errors are shown for --debug --immediate
2625 t/t7500-commit.sh: use test_cmp instead of test
2628 Version v1.7.4.1; changes since v1.7.4:
2629 ---------------------------------------
2632 clone: fixup recurse_submodules option
2635 gitweb: Mention optional Perl modules in INSTALL
2638 t5526: Fix wrong argument order in "git config"
2639 pull: Document the "--[no-]recurse-submodules" options
2642 start_command: flush buffers in the WIN32 code path as well
2643 t4120-apply-popt: help systems with core.filemode=false
2645 Jonathan Nieder (5):
2646 quote.h: simplify the inclusion
2647 fast-import: clarify documentation of "feature" command
2648 fast-import: introduce "feature notes" command
2649 compat: helper for detecting unsigned overflow
2650 svn-fe: warn about experimental status
2653 fsck: drop unused parameter from traverse_one_object()
2654 fsck: do not give up too early in fsck_dir()
2657 Nguyễn Thái Ngọc Duy (4):
2658 diff: support --cached on unborn branches
2659 Add const to parse_{commit,tag}_buffer()
2660 sha1_file.c: move find_cached_object up so sha1_object_info can use it
2661 sha1_object_info: examine cached_object store too
2664 t3509: use unconstrained initial test to setup repository.
2665 t7407: fix line endings for mingw build
2667 Shawn O. Pearce (1):
2668 bundle: Use OFS_DELTA in bundle files
2670 Sitaram Chamarty (1):
2671 post-receive-email: suppress error if description file missing
2673 Uwe Kleine-König (1):
2674 Documentation/merge subtree How-To: fix typo
2677 Version v1.7.4; changes since v1.7.4-rc3:
2678 -----------------------------------------
2681 Don't pass "--xhtml" to hightlight in gitweb.perl script.
2684 rebase: use explicit "--" with checkout
2685 rebase: give a better error message for bogus branch
2686 tests: sanitize more git environment variables
2688 Jonathan Nieder (2):
2689 fast-import: treat filemodify with empty tree as delete
2690 rebase -i: clarify in-editor documentation of "exec"
2696 Version v1.7.4-rc3; changes since v1.7.4-rc2:
2697 ---------------------------------------------
2700 userdiff: match Pascal class methods
2702 Björn Steinbrink (1):
2703 Correctly report corrupted objects
2706 exec_cmd: remove unused extern
2709 Fix expected values of setup tests on Windows
2710 t/README: hint about using $(pwd) rather than $PWD in tests
2712 Jonathan Nieder (9):
2713 ll-merge: simplify opts == NULL case
2714 Documentation/fast-import: capitalize beginning of sentence
2715 remote-ext: do not segfault for blank lines
2716 Documentation/fast-import: put explanation of M 040000 <dataref> "" in context
2717 tests: cosmetic improvements to the repo-setup test
2718 tests: compress the setup tests
2719 Documentation: do not treat reset --keep as a special case
2720 Subject: setup: officially support --work-tree without --git-dir
2721 t1510: fix typo in the comment of a test
2724 Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase
2727 Ramsay Allan Jones (1):
2728 svndump.c: Fix a printf format compiler warning
2731 Version v1.7.4-rc2; changes since v1.7.4-rc1:
2732 ---------------------------------------------
2735 Mark gitk script executable
2738 trace.c: ensure NULL is not passed to printf
2739 t0001,t1510,t3301: use sane_unset which always returns with status 0
2740 t3032: limit sed branch labels to 8 characters
2743 docs: explain diff.*.binary option
2745 Jonathan Nieder (3):
2746 diff: funcname and word patterns for perl
2747 gitweb: make logo optional
2748 t9010: svnadmin can fail even if available
2751 userdiff/perl: catch BEGIN/END/... and POD as headers
2755 commit: suggest --amend --reset-author to fix commiter identity
2757 Michael J Gruber (1):
2758 RelNotes/1.7.4: minor fixes
2760 Ramsay Allan Jones (7):
2761 lib-git-svn.sh: Move web-server handling code into separate function
2762 t9157-*.sh: Add an svn version check
2763 t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
2764 t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
2765 t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
2766 t4135-*.sh: Skip the "backslash" tests on cygwin
2767 t9157-*.sh: Make the svn version check more precise
2770 git svn: fix the final example in man page
2773 gitweb: add extensions to highlight feature map
2774 gitweb: remove unnecessary test when closing file descriptor
2777 Documentation/git-archive: spell --worktree-attributes correctly
2778 Documentation/githooks: post-rewrite-copy-notes never existed
2779 submodule: fix relative url parsing for scp-style origin
2780 t0000: quote TAP snippets in test code
2783 Version v1.7.4-rc1; changes since v1.7.4-rc0:
2784 ---------------------------------------------
2787 t/t9001-send-email.sh: fix '&&' chain in some tests
2789 Jonathan Nieder (3):
2790 vcs-svn: Error out for v3 dumps
2791 gitweb: skip logo in atom feed when there is none
2792 daemon: support <directory> arguments again
2795 t0021: avoid getting filter killed with SIGPIPE
2799 Michael J Gruber (2):
2800 cvsimport: partial whitespace cleanup
2801 cvsimport: handle the parsing of uppercase config options
2804 convert filter: supply path to external driver
2806 Ralf Wildenhues (1):
2807 Fix typos in the documentation
2809 Robin H. Johnson (1):
2810 t9001: Fix test prerequisites
2813 Version v1.7.4-rc0; changes since v1.7.3.5:
2814 -------------------------------------------
2817 status: show branchname with a configurable color
2819 Alexander Sulfrian (2):
2820 daemon: add helper function named_sock_setup
2821 daemon: allow more than one host address given via --listen
2823 Alexandre Erwin Ittner (1):
2824 gitk: Add Brazilian Portuguese (pt-BR) translation
2827 describe: Use for_each_rawref
2828 describe: Do not use a flex array in struct commit_name
2829 describe: Store commit_names in a hash table by commit SHA1
2830 describe: Delay looking up commits until searching for an inexact match
2833 git-send-email.perl: make initial In-Reply-To apply only to first email
2836 diffcore-pickaxe.c: a void function shouldn't try to return something
2837 Makefile: add NO_FNMATCH_CASEFOLD to IRIX sections
2838 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
2840 Brian Gernhardt (1):
2841 t6022: Use -eq not = to test output of wc -l
2843 Christopher Wilson (1):
2844 Enable highlight executable path as a configuration option
2846 Clemens Buchacher (6):
2847 t7607: use test-lib functions and check MERGE_HEAD
2848 t7607: add leading-path tests
2849 add function check_ok_to_remove()
2850 lstat_cache: optionally return match_len
2851 do not overwrite files in leading path
2852 use persistent memory for rejected paths
2855 mergetool-lib: combine vimdiff and gvimdiff run blocks
2856 mergetool-lib: add a three-way diff view for vim/gvim
2857 mergetool-lib: make the three-way diff the default for vim/gvim
2860 fast-import: Allow filemodify to set the root
2861 fast-import: insert new object entries at start of hash bucket
2862 fast-import: let importers retrieve blobs
2865 Document pre-condition for tree_entry_interesting
2866 tree-walk: Correct bitrotted comment about tree_entry()
2867 tree_entry_interesting(): Make return value more specific
2868 diff_tree(): Skip skip_uninteresting() when all remaining paths interesting
2869 t3509: Add rename + D/F conflict testcase that recursive strategy fails
2870 merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
2871 t6032: Add a test checking for excessive output from merge
2872 t6022: Add test combinations of {content conflict?, D/F conflict remains?}
2873 t6022: Add tests for reversing order of merges when D/F conflicts present
2874 t6022: Add tests with both rename source & dest involved in D/F conflicts
2875 t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)
2876 t6022: Add tests for rename/rename combined with D/F conflicts
2877 t6020: Modernize style a bit
2878 t6020: Add a testcase for modify/delete + directory/file conflict
2879 t6036: Test index and worktree state, not just that merge fails
2880 t6036: Add a second testcase similar to the first but with content changes
2881 t6036: Add testcase for undetected conflict
2882 merge-recursive: Small code clarification -- variable name and comments
2883 merge-recursive: Rename conflict_rename_rename*() for clarity
2884 merge-recursive: Nuke rename/directory conflict detection
2885 merge-recursive: Move rename/delete handling into dedicated function
2886 merge-recursive: Move delete/modify handling into dedicated function
2887 merge-recursive: Move process_entry's content merging into a function
2888 merge-recursive: New data structures for deferring of D/F conflicts
2889 merge-recursive: New function to assist resolving renames in-core only
2890 merge-recursive: Have process_entry() skip D/F or rename entries
2891 merge-recursive: Structure process_df_entry() to handle more cases
2892 merge-recursive: Update conflict_rename_rename_1to2() call signature
2893 merge-recursive: Update merge_content() call signature
2894 merge-recursive: Avoid doubly merging rename/add conflict contents
2895 merge-recursive: Move handling of double rename of one file to two
2896 merge-recursive: Move handling of double rename of one file to other file
2897 merge-recursive: Delay handling of rename/delete conflicts
2898 merge-recursive: Delay content merging for renames
2899 merge-recursive: Delay modify/delete conflicts if D/F conflict present
2900 conflict_rename_delete(): Check whether D/F conflicts are still present
2901 conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
2902 merge_content(): Check whether D/F conflicts are still present
2903 handle_delete_modify(): Check whether D/F conflicts are still present
2904 merge-recursive: Make room for directories in D/F conflicts
2905 merge-recursive: Remove redundant path clearing for D/F conflicts
2906 t4017 (diff-retval): replace manual exit code check with test_expect_code
2907 t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&
2908 t4002 (diff-basic): use test_might_fail for commands that might fail
2909 t4202 (log): Replace '<git-command> || :' with test_might_fail
2910 t4019 (diff-wserror): add lots of missing &&
2911 t4026 (color): remove unneeded and unchained command
2912 t5602 (clone-remote-exec): add missing &&
2913 t6016 (rev-list-graph-simplify-history): add missing &&
2914 t7001 (mv): add missing &&
2915 t7601 (merge-pull-config): add missing &&
2916 t7800 (difftool): add missing &&
2917 Introduce sane_unset and use it to ensure proper && chaining
2920 Side-step sed line-ending "corruption" leading to t6038 failure.
2921 Side-step MSYS-specific path "corruption" leading to t5560 failure.
2922 Fix 'clone' failure at DOS root directory.
2923 Fix Windows-specific macro redefinition warning.
2924 Add MinGW-specific execv() override.
2926 Erik Faye-Lund (20):
2927 mingw: do not crash on open(NULL, ...)
2928 inet_ntop: fix a couple of old-style decls
2930 mingw: support waitpid with pid > 0 and WNOHANG
2931 mingw: add kill emulation
2932 daemon: use run-command api for async serving
2933 daemon: use full buffered mode for stderr
2934 daemon: get remote host address from root-process
2935 mingw: import poll-emulation from gnulib
2936 mingw: use poll-emulation from gnulib
2937 daemon: use socklen_t
2938 daemon: make --inetd and --detach incompatible
2939 daemon: opt-out on features that require posix
2940 msvc: opendir: fix malloc-failure
2941 msvc: opendir: allocate enough memory
2942 msvc: opendir: do not start the search
2943 win32: dirent: handle errors
2944 msvc: opendir: handle paths ending with a slash
2945 win32: use our own dirent.h
2946 help: always suggest common-cmds if prefix of cmd
2948 Giuseppe Bilotta (15):
2949 gitweb: use fullname as hash_base in heads link
2950 gitweb: introduce remote_heads feature
2951 gitweb: git_get_heads_list accepts an optional list of refs
2952 gitweb: separate heads and remotes lists
2953 gitweb: nagivation menu for tags, heads and remotes
2954 gitweb: allow action specialization in page header
2955 gitweb: remotes view for a single remote
2956 gitweb: refactor repository URL printing
2957 gitweb: provide a routine to display (sub)sections
2958 gitweb: group remote heads by remote
2959 git instaweb: enable remote_heads
2960 web--browse: coding style
2961 web--browse: split valid_tool list
2962 web--browse: support opera, seamonkey and elinks
2963 web--browse: better support for chromium
2966 Allow creation of arbitrary git-shell commands
2967 Add interactive mode to git-shell for user-friendliness
2968 Add sample commands for git-shell
2969 shell: Display errors from improperly-formatted command lines
2971 Ilari Liusvaara (4):
2972 Add bidirectional_transfer_loop()
2975 remote-fd/ext: finishing touches after code review
2977 Jakub Narebski (12):
2978 t/gitweb-lib.sh: Use GIT_BUILD_DIR
2979 t/gitweb-lib.sh: Use tabs for indent consistently
2980 gitweb: Move call to evaluate_git_version after evaluate_gitweb_config
2981 t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED
2982 gitweb/Makefile: Add 'test' and 'test-installed' targets
2983 gitweb/Makefile: Include gitweb/config.mak
2984 gitweb: Fix test of highlighting support in t9500
2985 gitweb: Fix bug in evaluate_path_info
2986 gitweb: Improve behavior for actionless path_info gitweb URLs
2987 gitweb: Time::HiRes is in core for Perl 5.8
2988 gitweb: selectable configurations that change with each request
2989 gitweb: Fix handling of whitespace in generated links
2992 read-tree: deprecate syntax without tree-ish args
2995 tests: factor out terminal handling from t7006
2996 tests: test terminal output to both stdout and stderr
2997 push: pass --progress down to git-pack-objects
2998 config: treat non-existent config files as empty
2999 diff: report bogus input to -C/-M/-B
3000 docs: clarify git diff modes of operation
3001 allow command-specific pagers in pager.<cmd>
3002 docs: default to more modern toolset
3003 default color.status.branch to "same as header"
3004 tests: add some script lint checks
3005 tests: flip executable bit on t9158
3006 handle arbitrary ints in git_config_maybe_bool
3007 t2107: mark passing test as success
3010 clone: Add the --recurse-submodules option as alias for --recursive
3011 fetch/pull: Add the --recurse-submodules option
3012 Add the 'fetch.recurseSubmodules' config setting
3013 Submodules: Add the "fetchRecurseSubmodules" config option
3014 git submodule: Remove now obsolete tests before cloning a repo
3017 git-send-email.perl: Add --to-cmd
3020 notes.c: Hexify SHA1 in die() message from init_notes()
3021 (trivial) notes.h: Minor documentation fixes to copy_notes()
3022 notes.h: Make default_notes_ref() available in notes API
3023 notes.c: Reorder functions in preparation for next commit
3024 notes.h/c: Allow combine_notes functions to remove notes
3025 notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond
3026 (trivial) t3303: Indent with tabs instead of spaces for consistency
3027 notes.c: Use two newlines (instead of one) when concatenating notes
3028 builtin/notes.c: Split notes ref DWIMmery into a separate function
3029 git notes merge: Initial implementation handling trivial merges only
3030 builtin/notes.c: Refactor creation of notes commits.
3031 git notes merge: Handle real, non-conflicting notes merges
3032 git notes merge: Add automatic conflict resolvers (ours, theirs, union)
3033 Documentation: Preliminary docs on 'git notes merge'
3034 git notes merge: Manual conflict resolution, part 1/2
3035 git notes merge: Manual conflict resolution, part 2/2
3036 git notes merge: List conflicting notes in notes merge commit message
3037 git notes merge: --commit should fail if underlying notes ref has moved
3038 git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
3039 git notes merge: Add testcases for merging notes trees at different fanouts
3040 Provide 'git notes get-ref' to easily retrieve current notes ref
3041 cmd_merge(): Parse options before checking MERGE_HEAD
3042 Provide 'git merge --abort' as a synonym to 'git reset --merge'
3044 Johannes Schindelin (1):
3045 merge-octopus: Work around environment issue on Windows
3048 t7300: add a missing SYMLINKS prerequisite
3049 apply --whitespace=fix: fix tab-in-indent
3050 Make the tab width used for whitespace checks configurable
3051 Avoid duplicate test number t7609
3053 Jonathan Nieder (52):
3054 merge-recursive: expose merge options for builtin merge
3055 ll-merge: replace flag argument with options struct
3056 commit-tree: free commit message before exiting
3057 test-lib: allow test code to check the list of declared prerequisites
3058 test_terminal: catch use without TTY prerequisite
3059 test_terminal: ensure redirections work reliably
3060 fast-import: filemodify after M 040000 <tree> "" crashes
3061 fast-import: tighten M 040000 syntax
3062 t9300 (fast-import): another test for the "replace root" feature
3063 fast-import: do not clear notes in do_change_note_fanout()
3064 user-manual: remote-tracking can be checked out, with detached HEAD
3065 tests: add missing &&
3066 tests: add missing &&, batch 2
3067 test-lib: introduce test_line_count to measure files
3068 t6022 (renaming merge): chain test commands with &&
3069 t1502 (rev-parse --parseopt): test exit code from "-h"
3070 t1400 (update-ref): use test_must_fail
3071 t3301 (notes): use test_expect_code for clarity
3072 t3404 (rebase -i): unroll test_commit loops
3073 t3404 (rebase -i): move comment to description
3074 t3404 (rebase -i): introduce helper to check position of HEAD
3075 t4124 (apply --whitespace): use test_might_fail
3076 wrapper: move xmmap() to sha1_file.c
3077 wrapper: move odb_* to environment.c
3078 path helpers: move git_mkstemp* to wrapper.c
3079 strbuf: move strbuf_branchname to sha1_name.c
3080 wrapper: give zlib wrappers their own translation unit
3081 pack-objects: mark file-local variable static
3082 Remove pack file handling dependency from wrapper.o
3083 Describe various forms of "be quiet" using OPT__QUIET
3084 fast-import: treat SIGUSR1 as a request to access objects early
3085 git-rev-parse.txt: clarify --git-dir
3086 gitweb: document $per_request_config better
3087 fast-import: stricter parsing of integer options
3088 fast-import: clarify documentation of "feature" command
3089 fast-import: Allow cat-blob requests at arbitrary points in stream
3090 git submodule -b ... of current HEAD fails
3091 Makefile: dependencies for vcs-svn tests
3092 parse-options: clearer reporting of API misuse
3093 parse-options: move NODASH sanity checks to parse_options_check
3094 parse-options: sanity check PARSE_OPT_NOARG flag
3095 parse-options: never suppress arghelp if LITERAL_ARGHELP is set
3096 parse-options: allow git commands to invent new option types
3097 parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION
3098 update-index: migrate to parse-options API
3099 treap: make treap_insert return inserted node
3100 vcs-svn: fix intermittent repo_tree corruption
3101 Makefile: transport-helper uses thread-utils.h
3102 t9300: avoid short reads from dd
3103 bash: simple reimplementation of _get_comp_words_by_ref
3104 t9300: use perl "head -c" clone in place of "dd bs=1 count=16000" kluge
3105 t0001: test git init when run via an alias
3108 Add string comparison functions that respect the ignore_case variable.
3109 Case insensitivity support for .gitignore via core.ignorecase
3110 Add case insensitivity support for directories when using git status
3111 Add case insensitivity support when using git ls-files
3112 Support case folding for git add when core.ignorecase=true
3113 Support case folding in git fast-import when core.ignorecase=true
3115 Junio C Hamano (31):
3116 gitdiffcore doc: update pickaxe description
3117 diff: pass the entire diff-options to diffcore_pickaxe()
3118 git log/diff: add -G<regexp> that greps in the patch text
3119 diff/log -G<pattern>: tests
3120 grep: move logic to compile header pattern into a separate helper
3121 log --author: take union of multiple "author" requests
3122 disallow branch names that start with a hyphen
3124 merge-recursive: Restructure showing how to chain more process_* functions
3125 Martin Langhoff has a new e-mail address
3126 Make test script t9157 executable
3127 merge-recursive:make_room_for_directories - work around dumb compilers
3128 core.abbrevguard: Ensure short object names stay unique a bit longer
3129 read_sha1_file(): report correct name of packfile with a corrupt object
3130 A loose object is not corrupt if it cannot be read due to EMFILE
3131 t9001: send-email interation with --in-reply-to and --chain-reply-to
3132 t3404: do not use 'describe' to implement test_cmp_rev
3133 Update draft release notes to 1.7.4
3134 Update draft release notes to 1.7.4
3135 t9300: remove unnecessary use of /dev/stdin
3136 t9119: do not compare "Text Last Updated" line from "svn info"
3137 t9010 fails when no svn is available
3138 get_sha1: teach ":$n:<path>" the same relative path logic
3139 Documentation/git.txt: update list of maintenance releases
3140 fetch_populated_submodules(): document dynamic allocation
3141 thread-utils.h: simplify the inclusion
3142 Relnotes: remove items fixed on 'maint'
3143 get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable
3144 Update draft release notes to 1.7.4
3145 set_try_to_free_routine(NULL) means "do nothing special"
3149 merge-recursive --patience
3150 merge-recursive: options to ignore whitespace changes
3153 merge-recursive: option to specify rename threshold
3154 diff: add synonyms for -M, -C, -B
3155 completion: Support the DWIM mode for git checkout
3156 blame: Add option to show author email instead of name
3157 submodule: preserve all arguments exactly when recursing
3158 submodule: only preserve flags across recursive status/update invocations
3159 rebase: better rearranging of fixup!/squash! lines with --autosquash
3160 rebase: teach --autosquash to match on sha1 in addition to message
3161 diff: add --detect-copies-harder as a synonym for --find-copies-harder
3164 gitk: Show notes by default (like git log does)
3167 completion: make compatible with zsh
3168 completion: fix zsh check under bash with 'set -u'
3171 add support for the SUA layer (interix; windows)
3172 Interix: add configure checks
3175 Improve the mingw getaddrinfo stub to handle more use cases
3177 Martin von Zweigbergk (3):
3178 rebase: support --verify
3179 Use reflog in 'pull --rebase . foo'
3180 completion: add missing configuration variables
3183 Better "Changed but not updated" message in git-status
3184 Replace "remote tracking" with "remote-tracking"
3185 Change remote tracking to remote-tracking in non-trivial places
3186 everyday.txt: change "tracking branch" to "remote-tracking branch"
3187 Change "tracking branch" to "remote-tracking branch"
3188 Change incorrect uses of "remote branch" meaning "remote-tracking"
3189 Change incorrect "remote branch" to "remote tracking branch" in C code
3190 user-manual.txt: explain better the remote(-tracking) branch terms
3191 git-branch.txt: mention --set-upstream as a way to change upstream configuration
3193 Michael J Gruber (4):
3195 test: allow running the tests under "prove"
3196 t800?-blame.sh: retitle uniquely
3197 t1020-subdirectory: test alias expansion in a subdirectory
3200 mingw: add network-wrappers for daemon
3201 mingw: implement syslog
3202 compat: add inet_pton and inet_ntop prototypes
3204 Nguyễn Thái Ngọc Duy (64):
3205 branch -h: show usage even in an invalid repository
3206 checkout-index -h: show usage even in an invalid repository
3207 commit/status -h: show usage even with broken configuration
3208 gc -h: show usage even with broken configuration
3209 ls-files -h: show usage even with corrupt index
3210 merge -h: show usage even with corrupt index
3211 update-index -h: show usage even with corrupt index
3212 add: do not rely on dtype being NULL behavior
3213 get_cwd_relative(): do not misinterpret root path
3214 builtins: print setup info if repo is found
3215 Add t1510 and basic rules that run repo setup
3216 t1510: setup case #0
3217 t1510: setup case #1
3218 t1510: setup case #2
3219 t1510: setup case #3
3220 t1510: setup case #4
3221 t1510: setup case #5
3222 t1510: setup case #6
3223 t1510: setup case #7
3224 t1510: setup case #8
3225 t1510: setup case #9
3226 t1510: setup case #10
3227 t1510: setup case #11
3228 t1510: setup case #12
3229 t1510: setup case #13
3230 t1510: setup case #14
3231 t1510: setup case #15
3232 t1510: setup case #16
3233 t1510: setup case #17
3234 t1510: setup case #18
3235 t1510: setup case #19
3236 t1510: setup case #20
3237 t1510: setup case #21
3238 t1510: setup case #22
3239 t1510: setup case #23
3240 t1510: setup case #24
3241 t1510: setup case #25
3242 t1510: setup case #26
3243 t1510: setup case #27
3244 t1510: setup case #28
3245 t1510: setup case #29
3246 t1510: setup case #30
3247 t1510: setup case #31
3248 cache.h: realign and use (1 << x) form for CE_* constants
3249 dir.c: add free_excludes()
3250 unpack-trees: move all skip-worktree checks back to unpack_trees()
3251 unpack-trees: fix sparse checkout's "unable to match directories"
3252 Revert "excluded_1(): support exclude files in index"
3253 setup: save prefix (original cwd relative to toplevel) in startup_info
3254 Make prefix_path() return char* without const
3255 get_sha1: support relative path ":path" syntax
3256 get_sha1_oneline: make callers prepare the commit list to traverse
3257 get_sha1: support $commit^{/regex} syntax
3258 get_sha1: handle special case $commit^{/}
3259 Add git_config_early()
3260 Use git_config_early() instead of git_config() during repo setup
3261 setup: limit get_git_work_tree()'s to explicit setup case only
3262 setup: clean up setup_bare_git_dir()
3263 setup: clean up setup_discovered_git_dir()
3264 setup: rework setup_explicit_git_dir()
3265 Remove all logic from get_git_work_tree()
3266 Revert "Documentation: always respect core.worktree if set"
3267 git.txt: correct where --work-tree path is relative to
3268 setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd
3271 Minor indentation fix.
3272 Remove @smtp_host_parts variable as not used.
3273 New send-email option smtpserveroption.
3276 commit: helper methods to reduce redundant blocks of code
3277 pretty.c: teach format_commit_message() to reencode the output
3278 commit: --fixup option for use with rebase --autosquash
3279 add tests of commit --fixup
3280 commit: --squash option for use with rebase --autosquash
3281 add tests of commit --squash
3284 MinGW: fix stat() and lstat() implementations for handling symlinks
3285 MinGW: Report errors when failing to launch the html browser.
3286 Skip t1300.70 and 71 on msysGit.
3287 Do not strip CR when grepping HTTP headers.
3288 Skip 'git archive --remote' test on msysGit
3289 git-am: fix detection of absolute paths for windows
3290 git-gui: show command-line errors in a messagebox on Windows
3291 git-gui: enable the Tk console when tracing/debugging on Windows
3292 git-gui: generic version trimming
3293 git-gui: use full dialog width for old name when renaming branch
3294 git-gui: correct assignment of work-tree
3295 git-gui: use wordprocessor tab style to ensure tabs work as expected
3296 git-gui: apply color information from git diff output
3299 gitk: Update Swedish translation (290t)
3301 Peter van der Does (1):
3302 bash: get --pretty=m<tab> completion to work with bash v4
3305 Add global and system-wide gitattributes
3308 commit.c: Remove backward goto in read_craft_line()
3310 Ramkumar Ramachandra (10):
3311 shell: Rewrite documentation and improve error message
3312 t4014-format-patch: Call test_tick before committing
3313 format-patch: Don't go over merge commits
3314 fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
3315 merge: Make '--log' an integer option for number of shortlog entries
3316 merge: Make 'merge.log' an integer or boolean option
3317 t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
3318 t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
3319 Porcelain scripts: Rewrite cryptic "needs update" error message
3320 t9010 (svn-fe): Eliminate dependency on svn perl bindings
3322 Ramsay Allan Jones (10):
3323 msvc: Fix compilation errors in compat/win32/sys/poll.c
3324 msvc: git-daemon.exe: Fix linker "unresolved externals" error
3325 msvc: Fix build by adding missing INTMAX_MAX define
3326 msvc: Fix macro redefinition warnings
3327 t3600-rm.sh: Don't pass a non-existent prereq to test #15
3328 t9142: Move call to start_httpd into the setup test
3329 lib-git-svn.sh: Avoid setting web server variables unnecessarily
3330 lib-git-svn.sh: Add check for mis-configured web server variables
3331 t9501-*.sh: Fix a test failure on Cygwin
3332 difftool: Fix failure on Cygwin
3335 add description parameter to OPT__VERBOSE
3336 add description parameter to OPT__DRY_RUN
3337 add description parameter to OPT__QUIET
3339 archive: improve --verbose description
3340 branch: improve --verbose description
3341 verify-tag: document --verbose
3344 bisect: improve error message of 'bisect log' while not bisecting
3345 bisect: improve error msg of 'bisect reset' when original HEAD is deleted
3346 bisect: check for mandatory argument of 'bisect replay'
3347 bash: offer refs for 'git bisect start'
3348 bash: not all 'git bisect' subcommands make sense when not bisecting
3349 bash: support more 'git notes' subcommands and their options
3350 bash: support pretty format aliases
3353 parse-remote: handle detached HEAD
3356 t3030: Add a testcase for resolvable rename/add conflict with symlinks
3358 Sebastian Schuberth (3):
3359 MinGW: Use pid_t more consequently, introduce uid_t for greater compatibility
3360 MinGW: Add missing file mode bit defines
3361 On Windows, avoid git-gui to call Cygwin's nice utility
3363 Shawn O. Pearce (2):
3364 Use git_open_noatime when accessing pack data
3365 Work around EMFILE when there are too many pack files
3368 gitk: Prevent the text pane from becoming editable
3369 gitk: Make text selectable on Mac
3372 send-email: Use To: headers in patch files
3373 send-email: Don't leak To: headers between patches
3374 parse-options: Don't call parse_options_check() so much
3375 parse-options: do not infer PARSE_OPT_NOARG from option type
3378 git-svn: allow the mergeinfo property to be set
3381 contrib/ciabot: git-describe commit instead of HEAD
3384 t5523-push-upstream: add function to ensure fresh upstream repo
3385 t5523-push-upstream: test progress messages
3386 format-patch: page output with --stdout
3387 bash completion: add basic support for git-reflog
3390 commit: Add commit_list prefix in two function names.
3391 builtin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
3392 builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
3395 {cvs,svn}import: use the new 'git read-tree --empty'
3396 t0003: properly quote $HOME
3397 gitk: Add the equivalent of diff --color-words
3399 Torsten Bögershausen (1):
3400 t9143: do not fail when unhandled.log.gz is not created
3403 diff: use "find" instead of "detect" as prefix for long forms of -M and -C
3405 Ævar Arnfjörð Bjarmason (22):
3406 send-email: use catfile() to concatenate files
3407 send-email: use lexical filehandle for opendir
3408 send-email: use lexical filehandles for $compose
3409 send-email: use lexical filehandles during sending
3410 send-email: get_patch_subject doesn't need a prototype
3411 send-email: file_declares_8bit_cte doesn't need a prototype
3412 send-email: unique_email_list doesn't need a prototype
3413 send-email: cleanup_compose_files doesn't need a prototype
3414 send-email: use \E***\Q instead of \*\*\*
3415 send-email: sanitize_address use $foo, not "$foo"
3416 send-email: sanitize_address use qq["foo"], not "\"foo\""
3417 send-email: use (?:) instead of () if no match variables are needed
3418 send-email: send_message die on $!, not $?
3419 send-email: make_message_id use "require" instead of "use"
3420 send-email: use Perl idioms in while loop
3421 send-email: is_rfc2047_quoted use qr// regexes
3422 send-email: extract_valid_address use qr// regexes
3423 Makefile & configure: add a NO_FNMATCH flag
3424 Makefile & configure: add a NO_FNMATCH_CASEFOLD flag
3425 test-lib: make test_expect_code a test command
3426 t7004-tag.sh: re-arrange git tag comment for clarity
3427 tests: use test_cmp instead of piping to diff(1)
3430 CodingGuidelines: Add a section on writing documentation
3431 diff,difftool: Don't use the {0,2} notation in usage strings
3434 Version v1.7.3.5; changes since v1.7.3.4:
3435 -----------------------------------------
3438 test-lib.sh/test_decode_color(): use octal not hex in awk script
3441 gitweb: Include links to feeds in HTML header only for '200 OK' response
3444 ident: die on bogus date format
3447 Fix typo in git-gc document.
3449 Jonathan Nieder (2):
3450 t0050: fix printf format strings for portability
3451 gitweb: skip logo in atom feed when there is none
3454 commit: die before asking to edit the log message
3455 am --abort: keep unrelated commits since the last failure and warn
3456 rebase --skip: correctly wrap-up when skipping the last patch
3461 status: Quote paths with spaces in short format
3464 t/t8006: Demonstrate blame is broken when cachetextconv is on
3465 fill_textconv(): Don't get/put cache if sha1 is not valid
3468 fsck docs: remove outdated and useless diagnostic
3470 Michael J Gruber (2):
3471 git-difftool.txt: correct the description of $BASE and describe $MERGED
3472 difftool: provide basename to external tools
3474 Ramsay Allan Jones (1):
3475 t3419-*.sh: Fix arithmetic expansion syntax error
3478 close file on error in read_mmfile()
3480 Robin H. Johnson (2):
3481 Fix false positives in t3404 due to SHELL=/bin/false
3482 t9001: Fix test prerequisites
3485 userdiff: fix typo in ruby and python word regexes
3487 Vasyl' Vavrychuk (1):
3488 trace.c: mark file-local function static
3491 Version v1.7.3.4; changes since v1.7.3.3:
3492 -----------------------------------------
3495 contrib/hooks/post-receive-email: fix return values from prep_for_email
3497 Alejandro R. Sedeño (1):
3498 Add --force to git-send-email documentation
3501 apply: Recognize epoch timestamps with : in the timezone
3503 Christoph Mallon (1):
3504 diff --check: correct line numbers of new blank lines at EOF
3506 Clemens Buchacher (6):
3507 t7607: use test-lib functions and check MERGE_HEAD
3508 t7607: add leading-path tests
3509 add function check_ok_to_remove()
3510 lstat_cache: optionally return match_len
3511 do not overwrite files in leading path
3512 use persistent memory for rejected paths
3514 Federico Cuello (1):
3515 Fix git-apply with -p greater than 1
3518 t5550: test HTTP authentication and userinfo decoding
3519 Fix username and password extraction from HTTP URLs
3522 gitweb: Introduce esc_attr to escape attributes of HTML elements
3525 git-pull.txt: Mention branch.autosetuprebase
3528 log.decorate: accept 0/1 bool values
3529 reflogs: clear flags properly in corner case
3531 Jonathan "Duke" Leto (1):
3532 Correct help blurb in checkout -p and friends
3534 Jonathan Nieder (4):
3535 apply: handle patches with funny filename and colon in timezone
3536 cherry-pick/revert: transparently refresh index
3537 Documentation: split gitignore page into sections
3538 Documentation: point to related commands from gitignore
3541 test: git-apply -p2 rename/chmod only
3542 Do not link with -lcrypto under NO_OPENSSL
3548 setup: make sure git_dir path is in a permanent buffer, getenv(3) case
3550 Martin von Zweigbergk (2):
3551 rebase --abort: do not update branch ref
3552 rebase: only show stat if configured to true
3554 Michael J Gruber (6):
3555 t/t7004-tag: test handling of rfc1991 signatures
3556 verify-tag: factor out signature detection
3557 tag: factor out sig detection for body edits
3558 tag: factor out sig detection for tag display
3559 tag: recognize rfc1991 signatures
3560 git-rm.txt: Fix quoting
3562 Nguyễn Thái Ngọc Duy (1):
3563 entry.c: remove "checkout-index" from error messages
3566 diff: don't presume empty file when corresponding object is missing
3567 make pack-objects a bit more resilient to repo corruption
3570 smart-http: Don't change POST to GET when following redirect
3571 t5550-http-fetch: add missing '&&'
3572 t5550-http-fetch: add test for http-fetch
3573 shift end_url_with_slash() from http.[ch] to url.[ch]
3574 url: add str wrapper for end_url_with_slash()
3575 http-backend: use end_url_with_slash()
3576 http-push: Normalise directory names when pushing to some WebDAV servers
3577 http-push: check path length before using it
3578 http-push: add trailing slash at arg-parse time, instead of later on
3579 http-fetch: rework url handling
3581 Ævar Arnfjörð Bjarmason (2):
3582 perl: bump the required Perl version to 5.8 from 5.6.[21]
3583 perl: use "use warnings" instead of -w
3586 Version v1.7.3.3; changes since v1.7.3.2:
3587 -----------------------------------------
3590 submodule sync: Update "submodule.<name>.url" for empty directories
3593 Fix handling of git-p4 on deleted files
3596 userdiff.c: add builtin fortran regex patterns
3597 builtin/revert.c: don't dereference a NULL pointer
3599 Brian Gernhardt (1):
3600 t/gitweb-lib: Don't pass constant to decode_utf8
3602 Clemens Buchacher (3):
3603 add rebase patch id tests
3604 do not search functions for patch ID
3605 do not overwrite untracked during merge from unborn branch
3608 git-blame.el: Add (require 'format-spec)
3610 Diego Elio Pettenò (1):
3611 imap-send: link against libcrypto for HMAC and others
3614 mingw: do not set errno to 0 on success
3616 Giuseppe Bilotta (1):
3617 CodingGuidelines: mention whitespace preferences for shell scripts
3620 repack: add -F flag to let user choose between --no-reuse-delta/object
3621 Documentation: pack.compression: explain how to recompress
3624 git-commit.txt: (synopsis): move -i and -o before "--"
3627 diff: don't use pathname-based diff drivers for symlinks
3628 rev-list: handle %x00 NUL in user format
3629 docs: give more hints about how "add -e" works
3630 apply: don't segfault on binary files with missing data
3631 docs: give more hints about how "add -e" works
3632 document sigchain api
3635 pull: Remove --tags option from manpage
3638 mailmap: fix use of freed memory
3641 git-send-email.perl: Deduplicate "to:" and "cc:" entries with names
3643 Jonathan Nieder (5):
3644 t4203 (mailmap): stop hardcoding commit ids and dates
3645 send-pack: avoid redundant "pack-objects died with strange error"
3646 Documentation: document show -s
3647 add: introduce add.ignoreerrors synonym for add.ignore-errors
3648 Documentation: do not misinterpret pull refspec as bold text
3651 t4203: do not let "git shortlog" DWIM based on tty
3652 t3402: test "rebase -s<strategy> -X<opt>"
3653 Documentation: Fix mark-up of lines with more than one tilde
3658 test-lib: extend test_decode_color to handle more color codes
3659 diff: handle lines containing only whitespace and tabs better
3661 Kevin P. Fleming (1):
3662 post-receive-email: ensure sent messages are not empty
3665 blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
3666 blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
3667 blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
3669 Martin von Zweigbergk (2):
3670 rebase -X: do not clobber strategy
3671 Documentation/git-pull: clarify configuration
3673 Michael J Gruber (6):
3674 git-reset.txt: clarify branch vs. branch head
3675 git-reset.txt: reset does not change files in target
3676 git-reset.txt: reset --soft is not a no-op
3677 git-reset.txt: use "working tree" consistently
3678 git-reset.txt: point to git-checkout
3679 git-reset.txt: make modes description more consistent
3681 Nathan W. Panike (1):
3682 Fix a formatting error in git-merge.txt
3684 Nguyễn Thái Ngọc Duy (3):
3685 dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkout
3686 clean: avoid quoting twice
3687 clean: remove redundant variable baselen
3690 diff: avoid repeated scanning while looking for funcname
3693 send-email: Refuse to send cover-letter template subject
3694 prefix_filename(): safely handle the case where pfx_len=0
3695 merge-file: correctly find files when called in subdir
3696 repack: place temporary packs under .git/objects/pack/
3698 Uwe Kleine-König (1):
3699 get_author_ident_from_commit(): remove useless quoting
3702 Fix copy-pasted comments related to tree diff handling.
3703 Keep together options controlling the behaviour of diffcore-rename.
3704 Document that rev-list --graph triggers parent rewriting.
3707 bash: Match lightweight tags in prompt
3709 Ævar Arnfjörð Bjarmason (1):
3710 Makefile: add CC to TRACK_CFLAGS
3713 Version v1.7.3.2; changes since v1.7.3.1:
3714 -----------------------------------------
3716 Andreas Gruenbacher (1):
3717 Clarify and extend the "git diff" format documentation
3720 t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
3723 Documentation: update-index: -z applies also to --index-info
3726 diffcore-pickaxe.c: remove unnecessary curly braces
3729 documentation: git-config minor cleanups
3732 t3020 (ls-files-error-unmatch): remove stray '1' from end of file
3735 Documentation/git-svn: discourage "noMetadata"
3738 do not depend on signed integer overflow
3740 Johannes Schindelin (2):
3741 Make sure that git_getpass() never returns NULL
3742 Fix typo in pack-objects' usage
3745 stash: simplify parsing fixes
3747 Jonathan Nieder (10):
3748 t0004 (unwritable files): simplify error handling
3749 environment.c: remove unused variable
3750 setup: make sure git dir path is in a permanent buffer
3751 init: plug tiny one-time memory leak
3752 xdiff: cast arguments for ctype functions to unsigned char
3753 Documentation: No argument of ALLOC_GROW should have side-effects
3754 Documentation: gitrevisions is in section 7
3755 Documentation: diff can compare blobs
3756 Documentation: expand 'git diff' SEE ALSO section
3757 Documentation: update implicit "--no-index" behavior in "git diff"
3760 MinGW: avoid collisions between "tags" and "TAGS"
3761 CodingGuidelines: reword parameter expansion section
3762 shell portability: no "export VAR=VAL"
3766 Update test script annotate-tests.sh to handle missing/extra authors
3769 user-manual: be consistent in illustrations to 'git rebase'
3771 Mathias Lafeldt (1):
3772 git-svn: fix processing of decorated commit hashes
3775 diff: trivial fix for --output file error message
3777 Michael J Gruber (4):
3778 remote-helpers: build in platform independent directory
3779 user-manual: fix anchor name Finding-comments-With-given-Content
3780 rev-list-options: clarify --parents and --children
3781 git-show-ref.txt: clarify the pattern matching
3783 Ramkumar Ramachandra (1):
3784 SubmittingPatches: Document some extra tags used in commit messages
3787 work around buggy S_ISxxx(m) implementations
3790 git-svn: check_cherry_pick should exclude commits already in our history
3793 Better advice on using topic branches for kernel development
3795 Uwe Kleine-König (1):
3796 Documentation/git-clone: describe --mirror more verbosely
3799 t/t3415: use && where applicable.
3802 Use angles for placeholders consistently
3803 Fix odd markup in --diff-filter documentation
3804 Use parentheses and `...' where appropriate
3805 Remove stray quotes in --pretty and --format documentation
3806 Put a space between `<' and argument in pack-objects usage string
3807 Fix {update,checkout}-index usage strings
3810 Version v1.7.3.1; changes since v1.7.3:
3811 ---------------------------------------
3814 t/t3903-stash: improve testing of git-stash show
3815 wt-status.c: don't leak directory entries when processing untracked,ignored
3816 git-send-email.perl: ensure $domain is defined before using it
3818 Brian Gernhardt (1):
3819 git-stash: fix flag parsing
3821 Christian Couder (1):
3822 t6050 (replace): fix bogus "fetch branch with replacement" test
3824 Daniel Knittl-Frank (1):
3825 Improvements to `git checkout -h`
3828 prefer test -h over test -L in shell scripts
3831 stash: fix git stash branch regression when branch creation fails
3834 CodingGuidelines: spell Arithmetic Expansion with $(($var))
3838 Fix missing 'does' in man-page for 'git checkout'
3841 update comment and documentation for :/foo syntax
3843 Michael J Gruber (1):
3844 contrib/completion: --no-index option to git diff
3847 strbuf.h: fix comment typo
3848 dir.c: squelch false uninitialized memory warning
3850 Ramsay Allan Jones (1):
3851 t1503: Fix arithmetic expansion syntax error when using dash
3854 stash drops the stash even if creating the branch fails because it already exists
3856 Wesley J. Landaker (1):
3857 Documentation: Refer to git-commit-tree in git-filter-branch help
3860 Version v1.7.3; changes since v1.7.3-rc2:
3861 -----------------------------------------
3864 t/t7300: workaround ancient touch by rearranging arguments
3866 Brian Gernhardt (1):
3867 t7003: Use test_commit instead of custom function
3870 git-rebase--interactive.sh: replace cut with ${v%% *}
3873 git-ls-files.txt: clarify -x/--exclude option
3876 ls-files documentation: reword for consistency
3880 Version v1.7.3-rc2; changes since v1.7.3-rc1:
3881 ---------------------------------------------
3884 bundle: detect if bundle file cannot be created
3885 filter-branch: retire --remap-to-ancestor
3888 Several tests: cd inside subshell instead of around
3889 t1020: Get rid of 'cd "$HERE"' at the start of each test
3891 Jonathan Nieder (5):
3892 tests: subshell indentation stylefix
3893 t1450 (fsck): remove dangling objects
3894 t2105 (gitfile): add missing &&
3895 t1302 (core.repositoryversion): style tweaks
3896 t2016 (checkout -p): add missing &&
3899 t3101: modernise style
3900 ls-tree $di $dir: do not mistakenly recurse into directories
3904 git-gui: use shell to launch textconv filter in "blame"
3907 Add --src/dst-prefix to git-formt-patch in git-rebase.sh
3910 git-gui: Make usage statement visible on Windows.
3911 git-gui: display error launching blame as a message box.
3912 git-gui: handle textconv filter on Windows and in development
3913 git-gui: ensure correct application termination in git-gui--askpass
3914 git-gui: avoid mis-encoding the copyright message on Windows.
3918 git-gui: Update Swedish translation (521t).
3920 Ramsay Allan Jones (1):
3921 vcs-svn: Fix some printf format compiler warnings
3924 compat/nedmalloc: don't force NDEBUG on the rest of git
3927 RE: [PATCH] Avoid rename/add conflict when contents are identical
3930 Version v1.7.3-rc1; changes since v1.7.3-rc0:
3931 ---------------------------------------------
3934 Add a new option 'core.askpass'.
3937 t/t5510: demonstrate failure to fetch when current branch has merge ref
3938 builtin/fetch.c: ignore merge config when not fetching from branch's remote
3939 t/t7008: workaround broken handling of \000 by printf on IRIX
3940 Makefile: use compat regex on IRIX 6.5
3941 builtin/fetch.c: comment that branch->remote_name is usable when has_merge
3942 t/t5510-fetch.sh: improve testing with explicit URL and merge spec
3943 diff.c: call regfree to free memory allocated by regcomp when necessary
3944 xdiff-interface.c: always trim trailing space from xfuncname matches
3945 t/t4018: test whether the word_regex patterns compile
3946 t/t4018: avoid two unnecessary sub-shell invocations
3949 cache_tree_free: Fix small memory leak
3950 revert: Fix trivial comment style issue
3953 pass "git -c foo=bar" params through environment
3954 tests: make test_must_fail more verbose
3955 tests: make test_must_fail fail on missing commands
3958 t3404 & t7508: cd inside subshell instead of around
3961 notes: Don't create (empty) commit when removing non-existing notes
3964 fast-export: ensure that a renamed file is printed after all references
3966 Jonathan Nieder (3):
3967 do not pass "git -c foo=bar" params to transport helpers
3968 tests: make test_might_fail more verbose
3969 tests: make test_might_fail fail on missing commands
3972 install-webdoc: keep installed RelNotes-*.txt
3973 Prepare for 1.7.3 rc1
3977 Allow core.askpass to override SSH_ASKPASS.
3978 Extend documentation of core.askpass and GIT_ASKPASS.
3981 config.txt: fix placement of diff.noprefix
3984 Documentation: move RelNotes into a directory of their own
3987 builtin.h: Move two functions definitions to help.h.
3988 builtin/clean.c: Use STRING_LIST_INIT_NODUP.
3991 Version v1.7.3-rc0; changes since v1.7.2.5:
3992 -------------------------------------------
3994 Alejandro R. Sedeño (1):
3995 gitweb: move highlight config out of guess_file_syntax()
3998 Add a for_each_string_list_item macro
3999 Convert the users of for_each_string_list to for_each_string_list_item macro
4001 Alexander Gladysh (1):
4002 Add a rename + D/F conflict testcase
4005 gitweb: Don't die_error in git_tag after already printing headers
4008 git-rebase--interactive.sh: rework skip_unnecessary_picks
4009 git-rebase--interactive.sh: use printf instead of echo to print commit message
4011 Brian Gernhardt (2):
4012 t7610: cd inside subshell instead of around
4013 t7606: Avoid using head as a file name
4016 mergetool: Remove explicit references to /dev/tty
4018 Christian Couder (11):
4019 revert: report success when using option --strategy
4020 revert: refactor commit code into a new run_git_commit() function
4021 revert: don't print "Finished one cherry-pick." if commit failed
4022 revert: improve success message by adding abbreviated commit sha1
4023 t3508: add check_head_differs_from() helper function and use it
4024 revert: fix off by one read when searching the end of a commit subject
4025 revert: refactor code to find commit subject in find_commit_subject()
4026 revert: rename variables related to subject in get_message()
4027 bisect: use find_commit_subject() instead of custom code
4028 merge-recursive: use find_commit_subject() instead of custom code
4029 blame: use find_commit_subject() instead of custom code
4031 Clemens Buchacher (1):
4032 hash binary sha1 into patch id
4035 mergetool: Skip autoresolved paths
4038 Add memory pool library
4039 Add string-specific memory pool
4040 Add stream helper library
4041 Infrastructure to write revisions in fast-export format
4044 David D. Kilzer (3):
4045 git svn: fix dcommit to work with touched files
4046 git-svn: fix regex to remove "tail" from svn tags
4047 git-svn: fix fetch with deleted tag
4050 merge-recursive: porcelain messages for checkout
4051 t7609: test merge and checkout error messages
4053 Dmitry Statyvka (1):
4054 git svn: add an option to recode pathnames
4057 Add additional testcases for D/F conflicts
4058 merge-recursive: Fix D/F conflicts
4059 merge_recursive: Fix renames across paths below D/F conflicts
4060 fast-export: Fix output order of D/F changes
4061 fast-import: Improve robustness when D->F changes provided in wrong order
4062 fast-export: Fix dropping of files with --import-marks and path limiting
4063 fast-export: Add a --full-tree option
4064 upload-pack: Improve error message when bad ref requested
4065 Mark tests that use symlinks as needing SYMLINKS prerequisite
4066 merge-recursive: Fix typo
4067 t6031: Add a testcase covering multiple renames across a D/F conflict
4068 merge-recursive: Fix multiple file rename across D/F conflict
4069 merge-recursive: Avoid excessive output for and reprocessing of renames
4072 instaweb: fix WEBrick server support
4073 instaweb: minimize moving parts for WEBrick
4074 instaweb: add access+error logging for WEBrick
4075 t9155: fix compatibility with older SVN
4077 Eyvind Bernhardsen (3):
4078 Avoid conflicts when merging branches with mixed normalization
4079 Try normalizing files to avoid delete/modify conflicts when merging
4080 Don't expand CRLFs when normalizing text during merge
4083 Change regerror() declaration from K&R style to ANSI C (C89)
4086 split_cmdline: Allow caller to access error string
4089 Teach ref iteration module about submodules
4090 setup_revisions(): Allow walking history in a submodule
4091 Implement automatic fast-forward merge for submodules
4092 add configuration variable for --autosquash option of interactive rebase
4095 gitweb: Fix typo in run() subroutine
4098 Convert "! git" to "test_must_fail git"
4099 Add -e/--exclude to git-clean.
4100 Add test for git clean -e.
4101 builtin/push.c: remove useless temporary variable
4102 Document git-instaweb start/stop/restart
4105 Add treap implementation
4108 docs: fix Makefile dependency for user manual
4111 Submodules: Add the new "ignore" config option for diff and status
4112 Submodules: Use "ignore" settings from .gitmodules too for diff and status
4113 Add tests for the diff.ignoreSubmodules config option
4114 checkout: Add test for diff.ignoreSubmodules
4115 checkout: Use submodule.*.ignore settings from .git/config and .gitmodules
4116 t7405: cd inside subshell instead of around
4117 t7406 & t7407: add missing && at end of lines
4120 Make graph_next_line() available in the graph.h API
4121 Enable custom schemes for column colors in the graph API
4123 Johannes Schindelin (2):
4124 Add the 'diff.ignoreSubmodules' config setting
4125 checkout: respect diff.ignoreSubmodules setting
4128 Fix compat/regex ANSIfication on MinGW
4131 detached-stash: introduce parse_flags_and_revs function
4132 detached-stash: work around git rev-parse failure to detect bad log refs
4133 detached-stash: simplify stash_apply
4134 detached-stash: simplify stash_drop
4135 detached-stash: refactor git stash pop implementation
4136 detached-stash: simplify git stash branch
4137 detached-stash: simplify git stash show
4138 detached-stash: tests of git stash with stash-like arguments
4139 detached-stash: update Documentation
4140 rev-parse: exit with non-zero status if ref@{n} is not valid.
4141 sha1_name.c: use warning in preference to fprintf(stderr
4142 rev-parse: tests git rev-parse --verify master@{n}, for various n
4143 t1503: fix broken test_must_fail calls
4144 t3903: fix broken test_must_fail calls
4146 Jonathan Nieder (89):
4147 Teach fast-import to import subtrees named by tree id
4148 Export parse_date_basic() to convert a date string to timestamp
4149 t1501 (rev-parse): clarify
4150 tests: try git apply from subdir of toplevel
4151 setup: split off $GIT_DIR-set case from setup_git_directory_gently
4152 setup: split off a function to checks working dir for .git file
4153 setup: split off code to handle stumbling upon a repository
4154 setup: split off a function to handle hitting ceiling in repo search
4155 setup: split off get_device_or_die helper
4156 t1011 (sparse checkout): style nitpicks
4157 gitweb: allow configurations that change with each request
4158 t4111 (apply): refresh index before applying patches to it
4159 diff: split off a function for --stat-* option parsing
4160 t6038 (merge.renormalize): style nitpicks
4161 t6038 (merge.renormalize): try checkout -m and cherry-pick
4162 t6038 (merge.renormalize): check that it can be turned off
4163 merge-trees: push choice to renormalize away from low level
4164 merge-trees: let caller decide whether to renormalize
4165 Documentation/technical: document ll_merge
4166 ll-merge: make flag easier to populate
4167 ll-merge: let caller decide whether to renormalize
4168 t4200 (rerere): modernize style
4169 rerere: migrate to parse-options API
4170 rerere: never renormalize
4171 merge-recursive --renormalize
4172 Introduce vcs-svn lib
4173 Update svn-fe manual
4174 svn-fe manual: Clarify warning about deltas in dump files
4175 vcs-svn: remove build artifacts on "make clean"
4177 compat: add strtok_r()
4178 vcs-svn: Rename dirent pool to build on Windows
4179 vcs-svn: Avoid %z in format string
4180 t9010 (svn-fe): use Unix-style path in URI
4181 t9010 (svn-fe): avoid symlinks in test
4182 Eliminate “Finished cherry-pick/revert” message
4183 Introduce advise() to print hints
4184 cherry-pick/revert: Use error() for failure message
4185 cherry-pick/revert: Use advise() for hints
4186 t7606 (merge-theirs): modernize style
4187 merge: let custom strategies intervene in trivial merges
4188 t7006 (pager): add missing TTY prerequisites
4189 merge: do not mistake (ancestor of) tag for branch
4190 t7600 (merge): modernize style
4191 t7600 (merge): do not launch gitk for --debug
4192 t7600 (merge): check reflog entry
4193 t7600 (merge): test merge from branch yet to be born
4194 t6010 (merge-base): modernize style
4195 t6200 (fmt-merge-msg): style nitpicks
4196 Documentation: add a SEE ALSO section for merge-base
4197 merge-base --octopus to mimic show-branch --merge-base
4198 merge-base --independent to print reduced parent list in a merge
4199 fmt-merge-msg -m to override merge title
4200 merge script: --squash, --ff from unborn branch are errors
4201 merge script: tweak unmerged files message to match builtin
4202 merge script: refuse to merge during merge
4203 merge script: improve log message subject
4204 merge script: merge -X<option>
4205 merge script: allow custom strategies
4206 merge script: forbid merge -s index
4207 merge script: handle -m --log correctly
4208 merge script: handle many-way octopus
4209 merge script: --ff-only to disallow true merge
4210 merge script: handle --no-ff --no-commit correctly
4211 merge script: notice @{-1} shorthand
4212 merge script: learn --[no-]rerere-autoupdate
4213 autoconf: don't use platform regex if it lacks REG_STARTEND
4214 Documentation: set a !DOCTYPE for user manual
4215 Documentation: tweak description of log.date
4216 Documentation: quoting trouble in "git rm" discussion
4217 Documentation: unbreak regex in show-ref manual
4218 Documentation: clarify quoting in "git add" example
4219 Documentation: add missing quotes to "git grep" examples
4220 Documentation: clarify quoting in "git rm" example
4221 Documentation: clarify quoting in gitignore docs
4222 Documentation: remove backslashes in manpage synopses
4223 Documentation/technical: avoid stray backslash in parse-options API docs
4224 Documentation: remove stray backslash from "git bundle" manual
4225 Documentation: remove backslash before ~ in fast-import manual
4226 Documentation: remove stray backslashes in rev-parse manual
4227 Documentation: avoid stray backslashes in core tutorial
4228 Documentation: avoid stray backslash in user manual
4229 Documentation: do not convert ... operator to ellipses
4230 Documentation: remove stray backslashes from "Fighting regressions" article
4231 Documentation: remove stray backslash in show-branch discussion
4232 apply: split quoted filename handling into new function
4233 tests: exercise "git apply" with weird filenames
4234 apply: handle traditional patches with space in filename
4235 tests: simplify "missing PREREQ" message
4238 cvs tests: do not touch test CVS repositories shipped with source
4239 compat/regex: get rid of old-style definition
4240 autoconf: regex library detection typofix
4241 Work around em-dash handling in newer AsciiDoc
4242 install-webdoc: filter timestamp-only changes correctly
4245 Kevin P. Fleming (1):
4246 post-receive-email: optional message line count limit
4249 diff: parse separate options like -S foo
4250 diff: parse separate options --stat-width n, --stat-name-width n
4251 log: parse separate options like git log --grep foo
4252 log: parse separate option for --glob
4253 rebase -i: add exec command to launch a shell command
4254 test-lib: user-friendly alternatives to test [-d|-f|-e]
4255 Turn unpack_trees_options.msgs into an array + enum
4256 merge-recursive: distinguish "removed" and "overwritten" messages
4257 unpack_trees: group error messages by type
4258 tests: factor HOME=$(pwd) in test-lib.sh
4259 Move set_porcelain_error_msgs to unpack-trees.c and rename it
4260 setup_unpack_trees_porcelain: take the whole options struct as parameter
4261 Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
4262 t7609-merge-co-error-msgs: test non-fast forward case too.
4264 Michael J Gruber (3):
4265 git-bundle.txt: Cleanup
4266 git-bundle.txt: whitespace cleanup
4267 git-bundle.txt: Clarify rev-list-args restrictions
4270 rebase: support -X to pass through strategy options
4272 Nguyễn Thái Ngọc Duy (22):
4273 upload-pack: remove unused "create_full_pack" code in do_rev_list
4274 setup: do not forget working dir from subdir of gitdir
4275 Revert "rehabilitate 'git index-pack' inside the object store"
4276 setup: split off a function to handle ordinary .git directories
4277 unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set
4278 unpack-trees: let read-tree -u remove index entries outside sparse area
4279 unpack-trees: do not check for conflict entries too early
4280 unpack-trees: mark new entries skip-worktree appropriately
4281 git wrapper: introduce startup_info struct
4282 setup: remember whether repository was found
4283 git wrapper: allow setup_git_directory_gently() be called earlier
4284 shortlog: run setup_git_directory_gently() sooner
4285 grep: run setup_git_directory_gently() sooner
4286 apply: run setup_git_directory_gently() sooner
4287 bundle: run setup_git_directory_gently() sooner
4288 config: run setup_git_directory_gently() sooner
4289 index-pack: run setup_git_directory_gently() sooner
4290 ls-remote: run setup_git_directory_gently() sooner
4291 var: run setup_git_directory_gently() sooner
4292 merge-file: run setup_git_directory_gently() sooner
4293 clone: warn users --depth is ignored in local clones
4294 parse_object: pass on the original sha1, not the replaced one
4297 Userdiff patterns for C#
4299 Ralf Wildenhues (1):
4300 Typos in code comments, an error message, documentation
4302 Ramkumar Ramachandra (1):
4303 builtin/checkout: Fix message when switching to an existing branch
4305 Spencer E. Olson (1):
4306 Allow HTTP user agent string to be modified.
4309 git svn: URL-decode left-hand side of svn refspec
4311 Sverre Rabbelier (1):
4312 config: add --local option
4315 add tests for checkout -b
4316 builtin/checkout: reword hint for -b
4317 builtin/checkout: learn -B
4318 builtin/checkout: handle -B from detached HEAD correctly
4321 string_list: Add STRING_LIST_INIT macro and make use of it.
4322 object.h: Add OBJECT_ARRAY_INIT macro and make use of it.
4325 Do not unquote + into ' ' in URLs
4326 ls-files: learn a debugging dump format
4327 Makefile: make gcov invocation configurable
4328 test: Introduce $GIT_BUILD_DIR
4330 Ævar Arnfjörð Bjarmason (59):
4331 sha1_file: Show the the type and path to corrupt objects
4332 tests: Ignore the Test::Harness .prove file
4333 t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
4334 SubmittingPatches: Clarify the Signed-off-by rules
4335 SubmittingPatches: Cite the 50 char subject limit
4336 perl/Makefile: Unset INSTALL_BASE when making perl.mak
4337 test-lib: Don't write test-results when HARNESS_ACTIVE
4338 test-lib: Add support for multiple test prerequisites
4339 test-lib: Print missing prerequisites in test output
4340 t/README: Document the predefined test prerequisites
4341 tests: A SANITY test prereq for testing if we're root
4342 test-lib: Multi-prereq support only checked the last prereq
4343 tests: Infrastructure for Git smoke testing
4344 t/README: Document the Smoke testing
4345 t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh
4346 t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target
4347 gitignore: Ignore files generated by "make coverage"
4348 Makefile: Include subdirectories in "make cover" reports
4349 Makefile: Split out the untested functions target
4350 Makefile: Add cover_db target
4351 Makefile: Add cover_db_html target
4352 t/README: A new section about test coverage
4353 t/README: Add a note about the dangers of coverage chasing
4354 tests: implicitly skip SYMLINKS tests using <prereq>
4355 t/t4004-diff-rename-symlink.sh: use three-arg <prereq>
4356 t/t5800-remote-helpers.sh: Skip with prereq on python <2.4
4357 t/t7800-difftool.sh: Skip with prereq on no PERL
4358 t/README: Update "Skipping tests" to align with best practices
4359 t/t1304-default-acl: change from skip_all=* to prereq skip
4360 t/t5705-clone-2gb: change from skip_all=* to prereq skip
4361 t/t7005-editor: change from skip_all=* to prereq skip
4362 t/t5503-tagfollow: change from skip_all=* to prereq skip
4363 t/t4016-diff-quote: change from skip_all=* to prereq skip
4364 t/t3902-quoted: change from skip_all=* to prereq skip
4365 t/t3300-funny-names: change from skip_all=* to prereq skip
4366 git-notes: Run partial expensive test everywhere
4367 t/Makefile: Create test-results dir for smoke target
4368 tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
4369 t/t3701-add-interactive.sh: change from skip_all=* to prereq skip
4370 lib-patch-mode tests: change from skip_all=* to prereq skip
4371 t/t9600-cvsimport.sh: change from skip_all=* to prereq skip
4372 t/t9001-send-email.sh: Remove needless PROG=* assignment
4373 t/t9001-send-email.sh: change from skip_all=* to prereq skip
4374 t/t9001-send-email.sh: convert setup code to tests
4375 t/t7105-reset-patch.sh: Add a PERL prerequisite
4376 t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite
4377 t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite
4378 tests: fix syntax error in "Use advise() for hints" test
4379 compat/regex: use the regex engine from gawk for compat
4380 compat/regex: get the gawk regex engine to compile within git
4381 compat/regex: define out variables only used under RE_ENABLE_I18N
4382 t/t9010-svn-fe.sh: add an +x bit to this test
4383 t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND
4384 reset: suggest what to do upon "git reset --mixed <paths>"
4385 test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
4386 test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
4387 test-lib: Allow overriding of TEST_DIRECTORY
4388 t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
4389 test-lib: use subshell instead of cd $new && .. && cd $old
4392 Version v1.7.2.5; changes since v1.7.2.4:
4393 -----------------------------------------
4396 gitweb: Introduce esc_attr to escape attributes of HTML elements
4402 Version v1.7.2.4; changes since v1.7.2.3:
4403 -----------------------------------------
4406 diff.c: call regfree to free memory allocated by regcomp when necessary
4407 xdiff-interface.c: always trim trailing space from xfuncname matches
4410 cache_tree_free: Fix small memory leak
4411 revert: Fix trivial comment style issue
4414 Fix whitespace issue in object.c
4417 git-commit.txt: (synopsis): move -i and -o before "--"
4420 t5505: add missing &&
4422 Jonathan Nieder (1):
4423 add: introduce add.ignoreerrors synonym for add.ignore-errors
4426 tag.c: whitespace breakages fix
4427 t3101: modernise style
4431 config.txt: fix placement of diff.noprefix
4434 compat/nedmalloc: don't force NDEBUG on the rest of git
4437 bash: Match lightweight tags in prompt
4440 Version v1.7.2.3; changes since v1.7.2.2:
4441 -----------------------------------------
4444 Makefile: link builtins residing in bin directory to main git binary too
4445 Makefile: make hard/symbolic links for non-builtins too
4448 fetch: allow command line --tags to override config
4451 submodule sync: Update "submodule.<name>.url"
4454 t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
4455 pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
4456 tree-walk: Correct bitrotted comment about tree_entry()
4459 pack-refs: remove newly empty directories
4462 for-each-ref: fix objectname:short bug
4465 t7403: add missing &&'s
4467 Jonathan Nieder (12):
4468 t4150 (am): style fix
4469 t4150 (am): futureproof against failing tests
4470 t3400 (rebase): whitespace cleanup
4471 archive: abbreviate substituted commit ids again
4472 checkout, commit: remove confusing assignments to rev.abbrev
4473 examples/commit: use --abbrev for commit summary
4474 Documentation: flesh out “git pull” description
4475 core: Stop leaking ondisk_cache_entrys
4476 read-tree: stop leaking tree objects
4477 write-tree: Avoid leak when index refers to an invalid object
4478 t3302 (notes): Port to Solaris
4479 parse-options: clarify PARSE_OPT_NOARG description
4482 Teach "apply --index-info" to handle rename patches
4483 rebase: protect against diff.renames configuration
4484 diff --follow: do not waste cycles while recursing
4485 diff --follow: do call diffcore_std() as necessary
4490 Fix 'git log' early pager startup error case
4493 Tell ignore file about generate files in /gitweb/static
4496 xmalloc: include size in the failure message
4497 t0003: add missing && at end of lines
4500 fix >4GiB source delta assertion failure
4502 Ralf Wildenhues (1):
4503 Typos in code comments, an error message, documentation
4506 mingw_utime(): handle NULL times parameter
4507 rerere: fix overeager gc
4510 builtin/merge_recursive.c: Add an usage string and make use of it.
4513 Documentation/git-reset: reorder modes for soft-mixed-hard progression
4514 Documentation/reset: separate options by mode
4515 Documentation/reset: promote 'examples' one section up
4516 Documentation/reset: reorder examples to match description
4517 Documentation/reset: move "undo permanently" example behind "make topic"
4520 Documentation: spelling fixes
4522 Ævar Arnfjörð Bjarmason (1):
4523 log: test for regression introduced in v1.7.2-rc0~103^2~2
4526 Version v1.7.2.2; changes since v1.7.2.1:
4527 -----------------------------------------
4530 Documentation: cite git-am from git-apply
4533 t/t7003: replace \t with literal tab in sed expression
4535 Clément Poulain (1):
4536 git-gui: use textconv filter for diff and blame
4538 David D. Kilzer (1):
4539 Fix git rebase --continue to work with touched files
4542 git-gui: check whether systems nice command works or disable it
4543 git-gui: fix usage of themed widgets variable
4544 git-gui: fix usage of _gitworktree when creating shortcut for windows
4545 git-gui: fix PATH environment for mingw development environment
4546 git-gui: fix shortcut creation on cygwin
4549 diff: strip extra "/" when stripping prefix
4551 Jonathan Nieder (7):
4552 check-ref-format: handle subcommands in separate functions
4553 Allow "check-ref-format --branch" from subdirectory
4554 Makefile: add missing dependencies on url.h
4555 Makefile: add missing dependency on http.h
4556 Documentation: add a FILES section for show-ref
4557 gitweb: clarify search results page when no matching commit found
4558 Standardize do { ... } while (0) style
4561 Fix DIFF_QUEUE_CLEAR refactoring
4562 Documentation: reporting bugs
4563 sha1_name.c: fix parsing of ":/token" syntax
4566 Markus Heidelberg (1):
4567 git-gui: fix "Explore Working Copy" for Windows again
4570 Document ls-files -t as semi-obsolete.
4571 pretty-options.txt: match --format's documentation with implementation.
4572 Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C
4573 post-receive-email: remove spurious commas in email subject
4574 push: mention "git pull" in error message for non-fast forwards
4576 Michael J Gruber (1):
4577 Documentation/git-log: Clarify --full-diff
4580 index-pack: Don't follow replace refs.
4583 git-gui: Handle failure of core.worktree to identify the working directory.
4584 git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32
4585 git-gui: mc cannot be used before msgcat has been loaded
4586 git-gui: fix size and position of window panes on startup
4588 Raja R Harinath (1):
4589 fast-import: export correctly marks larger than 2^20-1
4591 Ramkumar Ramachandra (2):
4592 contrib/svn-fe: Fix IncludePath
4593 contrib/svn-fe: Add the svn-fe target to .gitignore
4596 notes: allow --dry-run for -n and --verbose for -v
4597 prune: allow --dry-run for -n and --verbose for -v
4599 Shawn O. Pearce (1):
4600 smart-http: Don't deadlock on server failure
4603 xsize_t: check whether we lose bits
4604 Documentation/rev-parse: quoting is required with --parseopt
4605 t7003: fix subdirectory-filter test
4608 git-rebase: fix typo when parsing --force-rebase
4610 Ævar Arnfjörð Bjarmason (4):
4611 test-lib: Ignore --quiet under a TAP harness
4612 test-lib: Remove 3 year old no-op --no-python option
4613 imap-send: Fix sprintf usage
4614 t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATH
4617 Version v1.7.2.1; changes since v1.7.2:
4618 ---------------------------------------
4621 git-rebase--interactive.sh: use printf instead of echo to print commit message
4624 git-instaweb: Fix custom apache log placement
4625 git-instaweb: Fix Apache environment variable passing
4626 git-instaweb: Don't assume Apache executable is named apache2
4629 Check size of path buffer before writing into it
4632 t3700-add: fix dependence on stdout and stderr buffering
4635 INSTALL: configure /etc/xml/catalog to build docs on Cygwin
4637 Jonathan Nieder (1):
4638 config --get --path: check for unset $HOME
4646 Clarify help message when no remote is specified in fetch/pull.
4648 Nathan W. Panike (1):
4649 Add a google-chrome option for web--browse
4651 Nguyễn Thái Ngọc Duy (1):
4652 git-read-tree.txt: acknowledge the directory matching bug in sparse checkout
4655 request-pull.txt: Document -p option
4656 commit: remove full stop from usage help for -u
4659 Cast execl*() NULL sentinels to (char *)
4660 Document receive.denyDeleteCurrent
4661 Documentation/git-push: Explain status output in more detail
4662 Fix 'git' wrapper usage string
4663 Makefile: add check-docs exception for gitrevisions
4666 Version v1.7.2; changes since v1.7.2-rc3:
4667 -----------------------------------------
4670 Makefile: remove some unnecessary curly braces
4671 Makefile: work around ksh's failure to handle missing list argument to for loop
4672 t/README: clarify test_must_fail description
4673 t/t3700: convert two uses of negation operator '!' to use test_must_fail
4674 t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_fail
4675 t/: work around one-shot variable assignment with test_must_fail
4678 Documentation: Explain git-mergetool's use of temporary files
4681 Reorganize `git-log' man page to clarify common diff options.
4684 Check size of path buffer before writing into it
4687 MERGE_RR is in .git, not .git/rr-cache
4690 git add: Add the "--ignore-missing" option for the dry run
4691 git submodule add: Require the new --force option to add ignored paths
4693 Jonathan Nieder (9):
4694 t7006 (pager): introduce helper for parameterized tests
4695 t7006: test pager configuration for several git commands
4696 tests: local config file should be honored from subdirs of toplevel
4697 t3000 (ls-files -o): modernize style
4698 git --paginate: paginate external commands again
4699 gitmodules.5: url can be a relative path
4700 Documentation: add submodule.* to the big configuration variable list
4701 Add a sample user for the svndump library
4702 t/README: correct an exception when breaking a && chain in tests
4706 rebase-i: do not get fooled by a log message ending with backslash
4707 do not write out index when status does not have to
4708 diff A...B: give one possible diff when there are more than one merge-base
4709 diff A...B: do not limit the syntax too narrowly
4710 tests: correct "does reflog exist?" tests
4713 Michael J Gruber (3):
4714 Documentation: split off rev doc into include file
4715 Documentation: gitrevisions
4716 Documentation: link to gitrevisions rather than git-rev-parse
4719 grep -O: Do not pass color sequences as filenames to pager
4721 Nguyễn Thái Ngọc Duy (1):
4722 git --paginate: do not commit pager choice too early
4724 Nicolas Sebrecht (1):
4725 merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
4727 Pavan Kumar Sunkara (1):
4731 update-server-info: Shorten read_pack_info_file()
4734 git-svn: write memoized data explicitly to avoid Storable bug
4737 Only run aggregate-results over actual counts
4740 add basic tests for merge-tree
4741 merge-tree: fix where two branches share no changes
4743 Ævar Arnfjörð Bjarmason (3):
4744 git submodule: add submodules with git add -f <path>
4745 git submodule add: Remove old docs about implicit -f
4746 git add: Add --ignore-missing to SYNOPSIS
4749 Version v1.7.2-rc3; changes since v1.7.2-rc2:
4750 ---------------------------------------------
4753 diff.c: fix a graph output bug
4755 Fredrik Skolmli (1):
4756 Documentation: Spelling fix in protocol-capabilities.txt
4759 t0005: work around strange $? in ksh when program terminated by a signal
4761 Jonathan Nieder (1):
4762 t9118 (git-svn): prevent early failure from taking down later tests
4765 Fix "read-tree -m A B" priming the cache-tree
4768 Michael J Gruber (3):
4769 t9118: avoid PEG revision identifier in tests
4770 test-lib: simplify GIT_SKIP_TESTS loop
4771 test-lib: TAP compliance for skipping tests on request
4774 format-patch: document the format.to configuration setting
4776 Nicolas Sebrecht (1):
4777 checkout: accord documentation to what git does
4780 git fetch documentation: describe short '-p' synonym to '--prune' option
4782 Raja R Harinath (1):
4783 Use dev_t for device id (st_dev) from stat in setup_git_directory_gently()
4785 Ævar Arnfjörð Bjarmason (1):
4786 tests: Use skip_all=* to skip tests
4789 Version v1.7.2-rc2; changes since v1.7.2-rc1:
4790 ---------------------------------------------
4793 t/t9700/test.pl: don't access private object members, use public access methods
4794 t/t0006: specify timezone as EST5 not EST to comply with POSIX
4797 Documentation/git-gc.txt: add reference to githooks
4800 xdiff: optimise for no whitespace difference when ignoring whitespace.
4803 add missing && to submodule-merge testcase
4806 gitweb: Move evaluate_gitweb_config out of run_request
4809 t0006: test timezone parsing
4810 parse_date: fix signedness in timezone calculation
4811 test-date: fix sscanf type conversion
4813 Jonathan Nieder (1):
4814 t/README: document more test helpers
4817 Updates from the list to 1.7.2 Release Notes
4818 t/README: proposed rewording...
4819 backmerge a few more fixes to 1.7.1.X series
4822 Michael J Gruber (1):
4823 rerere.txt: Document forget subcommand
4825 Pierre Habouzit (1):
4826 fix git branch -m in presence of cross devices
4828 Uwe Kleine-König (1):
4829 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
4831 Ævar Arnfjörð Bjarmason (13):
4832 test-lib: Adjust output to be valid TAP format
4833 test-lib: Make the test_external_* functions TAP-aware
4834 test-lib: output a newline before "ok" under a TAP harness
4835 tests: Skip tests in a way that makes sense under TAP
4836 tests: Say "pass" rather than "ok" on empty lines for TAP
4837 t9700: Use Test::More->builder, not $Test::Builder::Test
4838 t/README: The trash is in 't/trash directory.$name'
4839 t/README: Typo: paralell -> parallel
4840 t/README: Document the prereq functions, and 3-arg test_*
4841 t/README: Document test_external*
4842 t/README: Document test_expect_code
4843 t/README: Add a section about skipping tests
4844 t/README: Document the do's and don'ts of tests
4847 Version v1.7.2-rc1; changes since v1.7.2-rc0:
4848 ---------------------------------------------
4851 bash-completion: Fix __git_ps1 to work with "set -u"
4852 bash completion: Support "divergence from upstream" messages in __git_ps1
4855 t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression
4856 t/t7811-grep-open.sh: ensure fake "less" is made executable
4857 t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script
4858 t/t9001: use egrep when regular expressions are involved
4860 Brian Gernhardt (1):
4861 t4027,4041: Use test -s to test for an empty file
4863 Christian Couder (1):
4864 revert: accept arbitrary rev-list options
4867 notes: check number of parameters to "git notes copy"
4870 git diff: rename test that had a conflicting name
4871 Add optional parameters to the diff option "--ignore-submodules"
4872 git submodule: ignore dirty submodules for summary and status
4873 Add the option "--ignore-submodules" to "git status"
4875 Johannes Schindelin (3):
4876 Unify code paths of threaded greps
4877 grep: Add the option '--open-files-in-pager'
4878 grep -O: allow optional argument specifying the pager (or editor)
4880 Jonathan Nieder (3):
4881 grep: refactor grep_objects loop into its own function
4882 t3508 (cherry-pick): futureproof against unmerged files
4883 revert: do not rebuild argv on heap
4885 Julian Phillips (6):
4886 string_list: Fix argument order for print_string_list
4887 string_list: Fix argument order for for_each_string_list
4888 string_list: Fix argument order for string_list_insert
4889 string_list: Fix argument order for string_list_insert_at_index
4890 string_list: Fix argument order for string_list_lookup
4891 string_list: Fix argument order for string_list_append
4894 url_decode: URL scheme ends with a colon and does not require a slash
4895 Update draft release notes to 1.7.1.1
4897 git.spec.in: Add gitweb subpackage
4900 Michael J Gruber (4):
4901 t6018: add tests for rev-list's --branches and --tags
4902 t6018: make sure all tested symbolic names are different revs
4903 git-rev-parse.txt: Document ":path" specifier
4904 git-rev-parse.txt: Add more examples for caret and colon
4907 commit.h: add 'type' to struct name_decoration
4908 log-tree.c: Use struct name_decoration's type for classifying decoration
4909 log --decorate: Colorize commit decorations
4910 Allow customizable commit decorations colors
4911 Add test for correct coloring of git log --decoration
4913 Ramsay Allan Jones (2):
4914 msvc: Select the "fast" definition of the {get,put}_be32() macros
4915 notes: Initialise variable to appease gcc
4918 rev-list: introduce --count option
4921 Version v1.7.2-rc0; changes since v1.7.1.4:
4922 -------------------------------------------
4925 Allow passing of configuration parameters in the command line
4926 Use strbufs instead of open-coded string manipulation
4929 textconv: make the API public
4930 textconv: support for blame
4931 t/t8006: test textconv support for blame
4934 Add a macro DIFF_QUEUE_CLEAR.
4935 Make diffcore_std only can run once before a diff_flush
4936 Make git log --follow find copies among unmodified files.
4937 Add a prefix output callback to diff output
4938 Output the graph columns at the end of the commit message
4939 diff.c: Output the text graph padding before each diff line
4940 Emit a whole line in one go
4941 graph.c: register a callback for graph output
4942 Make --color-words work well with --graph
4945 t/t5800: skip if python version is older than 2.5
4946 git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh
4947 t/t5150: remove space from sed script
4948 t/t7006: ignore return status of shell's unset builtin
4949 t/aggregate-results: accomodate systems with small max argument list length
4950 Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS
4951 Remove python 2.5'isms
4953 Brian Gernhardt (1):
4954 Makefile: Simplify handling of python scripts
4957 whitespace: add tab-in-indent error class
4958 whitespace: tests for git-diff --check with tab-in-indent error class
4959 whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst
4960 whitespace: add tab-in-indent support for --whitespace=fix
4961 whitespace: tests for git-apply --whitespace=fix with tab-in-indent
4963 Christian Couder (13):
4964 revert: use strbuf to refactor the code that writes the merge message
4965 revert: refactor merge recursive code into its own function
4966 merge: refactor code that calls "git merge-STRATEGY"
4967 merge: make function try_merge_command non static
4968 revert: add "--strategy" option to choose merge strategy
4969 revert: cleanup code for -x option
4970 revert: use run_command_v_opt() instead of execv_git_cmd()
4971 revert: refactor code into a do_pick_commit() function
4972 revert: change help_msg() to take no argument
4973 revert: allow cherry-picking more than one commit
4974 revert: add tests to check cherry-picking many commits
4975 Documentation/cherry-pick: describe passing more than one commit
4976 Documentation/revert: describe passing more than one commit
4978 Clément Poulain (3):
4979 sha1_name: add get_sha1_with_context()
4980 textconv: support for cat_file
4981 t/t8007: test textconv support for cat-file
4983 Daniel Knittl-Frank (1):
4984 Show branch information in short output of git status
4987 Add `%B' in format strings for raw commit body in `git log' and friends
4990 diff: add configuration option for disabling diff prefixes.
4993 git svn: avoid unnecessary '/' in paths for SVN
4996 git checkout: create unparented branch by --orphan
4997 Documentation: alter checkout --orphan description
4998 refs: split log_ref_write logic into log_ref_setup
4999 checkout --orphan: respect -l option always
5000 t3200: test -l with core.logAllRefUpdates options
5001 bash completion: add --orphan to 'git checkout'
5004 mingw: use _commit to implement fsync
5006 Eyvind Bernhardsen (4):
5007 Add tests for per-repository eol normalization
5008 Add per-repository eol normalization
5009 Rename the "crlf" attribute "text"
5010 Add "core.eol" config variable
5012 Finn Arne Gangstad (1):
5013 autocrlf: Make it work also for un-normalized repositories
5015 Gary V. Vaughan (17):
5016 Makefile: pass CPPFLAGS through to fllow customization
5017 Rewrite dynamic structure initializations to runtime assignment
5018 Makefile: -lpthread may still be necessary when libc has only pthread stubs
5019 enums: omit trailing comma for portability
5020 Do not use "diff" found on PATH while building and installing
5021 tests: use "test_cmp", not "diff", when verifying the result
5022 test_cmp: do not use "diff -u" on platforms that lack one
5023 git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
5024 Makefile: some platforms do not have hstrerror anywhere
5025 Make NO_{INET_NTOP,INET_PTON} configured independently
5026 Some platforms lack socklen_t type
5027 Allow disabling "inline"
5028 inline declaration does not work on AIX
5029 Makefile: SunOS 5.6 portability fix
5030 Makefile: HPUX11 portability fixes
5031 Makefile: HP-UX 10.20 portability fixes
5032 Makefile: Tru64 portability fix
5034 Giuseppe Scrivano (1):
5035 print the usage string on stdout instead of stderr
5037 Henrik Grubbström (2):
5038 convert: Safer handling of $Id$ contraction.
5039 convert: Keep foreign $Id$ on checkout.
5041 Jakub Narebski (16):
5042 Export more test-related variables when running external tests
5043 gitweb: href(..., -path_info => 0|1)
5044 gitweb: Use nonlocal jump instead of 'exit' in die_error
5045 gitweb: Add custom error handler using die_error
5046 gitweb: Move generating page title to separate subroutine
5047 gitweb: Silence 'Variable VAR may be unavailable' warnings
5048 gitweb: Improve installation instructions in gitweb/INSTALL
5049 gitweb: Create install target for gitweb in Makefile
5050 gitweb: Refactor syntax highlighting support
5051 gitweb: Put all per-connection code in run() subroutine
5052 git-instaweb: Remove pidfile after stopping web server
5053 git-instaweb: Wait for server to start before running web browser
5054 git-instaweb: Add support for running gitweb via 'plackup'
5055 gitweb: Run in FastCGI mode if gitweb script has .fcgi extension
5056 gitweb: Fix typo in hash key name in %opts in git_header_html
5057 gitweb: Return or exit after done serving request
5060 git-am: suggest what to do with superfluous patches
5063 t5516-fetch-push.sh: style cleanup
5066 make commit_tree a library function
5067 introduce notes-cache interface
5068 textconv: refactor calls to run_textconv
5069 diff: cache textconv output
5070 diff: avoid useless filespec population
5071 script with rev-list instead of log
5072 tests: rename duplicate t4205
5073 tests: chmod +x t5150
5074 make url-related functions reusable
5075 decode file:// and ssh:// URLs
5076 Makefile: default pager on AIX to "more"
5079 diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s
5080 Documentation/rev-list-options.txt: Fix missing line in example history graph
5081 Documentation/rev-list-options.txt: Explain --ancestry-path
5082 revision: Fix typo in --ancestry-path error message
5083 revision: Turn off history simplification in --ancestry-path mode
5085 Johannes Schindelin (1):
5086 gitweb: Syntax highlighting support
5089 Modernize t5530-upload-pack-error.
5090 Make report() from usage.c public as vreportf() and use it.
5091 Fix signature of fcntl() compatibility dummy
5092 Windows: more pthreads functions
5093 Reimplement async procedures using pthreads
5094 Dying in an async procedure should only exit the thread, not the process.
5095 Enable threaded async procedures whenever pthreads is available
5096 Have set_try_to_free_routine return the previous routine
5097 Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used
5098 Recent MinGW has a C99 implementation of snprintf functions
5099 merge-recursive: demonstrate an incorrect conflict with submodule
5101 Jonathan Nieder (17):
5102 t7400: split setup into multiple tests
5103 t7400: clarify 'submodule add' tests
5104 t7400: clarify submodule update tests
5105 t5800: testgit helper requires Python support
5106 tests for request-pull
5107 request-pull: protect against OPTIONS_KEEPDASHDASH from environment
5108 fsck: check ident lines in commit objects
5109 adapt request-pull tests for new pull request format
5110 pretty: initialize new cmt_fmt_map to 0
5111 Makefile: fix header dependency checker to allow NO_CURL builds
5112 Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES
5113 git svn: avoid uninitialized var in 'reset'
5114 Add git remote set-branches
5115 fsck: fix bogus commit header check
5116 rebase: improve error message when upstream argument is missing
5117 DWIM 'git show -5' to 'git show --do-walk -5'
5118 git-svn: strip off leading slashes on --trunk argument
5120 Junio C Hamano (31):
5121 git_config_maybe_bool()
5122 log.decorate: usability fixes
5123 whitespace: we cannot "catch all errors known to git" anymore
5124 GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries
5125 Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM
5126 log --pretty/--oneline: ignore log.decorate
5127 war on "sleep" in tests
5128 reflog --expire-unreachable: avoid merge-base computation
5129 log.decorate: only ignore it under "log --pretty=raw"
5130 wt-status: remove unused workdir_untracked member
5131 wt-status: plug memory leak while collecting untracked files
5132 wt-status: collect ignored files
5133 wt-status: rename and restructure status-print-untracked
5134 status: --ignored option shows ignored files
5135 Document gc.<pattern>.reflogexpire variables
5136 more war on "sleep" in tests
5137 reflog --expire-unreachable: special case entries in "HEAD" reflog
5138 revision: --ancestry-path
5139 wt-status: fix 'fprintf' compilation warning
5140 t5150: protect backslash with backslash in shell
5142 fixup: do not unconditionally disable "diff -u"
5143 build: propagate $DIFF to scripts
5144 test-lib: use DIFF definition from GIT-BUILD-OPTIONS
5145 Update draft release notes to 1.7.2
5146 Update draft release notes to 1.7.2
5147 Update draft release notes to 1.7.2
5148 Drop items that are 1.7.1.1 fixes from the 1.7.1 release notes
5149 Update draft release notes to 1.7.2
5150 url.c: "<scheme>://" part at the beginning should not be URL decoded
5153 Lars R. Damerow (3):
5154 config.c: remove static keyword from git_env_bool()
5155 truncate cwd string before printing error message
5156 Add support for GIT_ONE_FILESYSTEM
5159 Make :/ accept a regex rather than a fixed pattern
5161 Michael J Gruber (5):
5162 for-each-ref: Field with abbreviated objectname
5163 notes: dry-run and verbose options for prune
5164 Documentation+t5708: document and test status -s -b
5165 pretty: Introduce ' ' modifier to add space if non-empty
5166 git-cat-file.txt: Document --textconv
5168 Michael J. Kiwala (1):
5169 git svn: fix empty directory creation
5172 patch-id: extract parsing one diff out of generate_id_list
5173 patch-id: Add support for mbox format
5175 Pavan Kumar Sunkara (6):
5176 gitweb: Use @diff_opts while using format-patch
5177 gitweb: Move static files into seperate subdirectory
5178 gitweb: Set default destination directory for installing gitweb in Makefile
5179 git-instaweb: Put httpd logs in a "$httpd_only" subdirectory
5180 git-instaweb: Configure it to work with new gitweb structure
5181 git-web--browse: Add support for google chrome and chromium
5183 Ramkumar Ramachandra (4):
5184 git am: Set cmdline globally
5185 git am: Display some help text when patch is empty
5186 git am: Remove stray error message from sed
5187 Refactor parse_date for approxidate functions
5190 grep: add test script for binary file handling
5191 grep: grep: refactor handling of binary mode options
5192 grep: --count over binary
5193 grep: --name-only over binary
5194 grep: use memmem() for fixed string search
5195 grep: continue case insensitive fixed string search after NUL chars
5196 grep: use REG_STARTEND for all matching if available
5197 grep: support NUL chars in search strings for -F
5200 gitweb: Add support for FastCGI, using CGI::Fast
5201 git-cvsserver: use a password file cvsserver pserver
5204 Honor "tagopt = --tags" configuration option
5205 remote add: add a --[no-]tags option
5208 branch: exit status now reflects if branch listing finds an error
5209 branch: don't fail listing branches if one of the commits wasn't found
5212 format-patch: Add a signature option (--signature)
5213 completion: Add --signature and format.signature
5216 Add `log.decorate' configuration variable.
5218 Sverre Rabbelier (7):
5219 clone: pass the remote name to remote_get
5220 clone: also configure url for bare clones
5221 fast-import: always create marks_file directories
5222 remote-helpers: allow requesing the path to the .git directory
5223 remote-helpers: add support for an export command
5224 remote-helpers: add testgit helper
5225 remote-helpers: add tests for testgit helper
5228 ls-remote: fall-back to default remotes when no remote specified
5229 ls-remote: print URL when no repo is specified
5232 diff: add --word-diff option that generalizes --color-words
5233 Complete prototype of git_config_from_parameters()
5234 fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)
5235 log_ref_setup: don't return stack-allocated array
5236 parseopt: wrap rev-parse --parseopt usage for eval consumption
5238 Torsten Schmutzler (1):
5239 git-svn: mangle refnames forbidden in git
5242 pretty: make it easier to add new formats
5243 pretty: add infrastructure for commit format aliases
5244 pretty: add aliases for pretty formats
5245 diff-options: make --patch a synonym for -p
5247 Ævar Arnfjörð Bjarmason (12):
5248 Add option to git-commit to allow empty log messages
5249 git-svn documentation: minor grammar fix
5250 git-svn: Remove unused use of File::Temp
5251 git-cvsserver: authentication support for pserver
5252 git-cvsserver: indent & clean up authdb code
5253 git-cvsserver: Improved error handling for pserver
5254 git-cvsserver: document making a password without htpasswd
5255 git-cvsserver: test for pserver authentication support
5256 git-submodule foreach: Add $toplevel variable
5257 Makefile: remove redundant munging of @@INSTLIBDIR@@
5258 git-cvsserver: typo in a comment: bas -> has
5259 git-cvsserver: fix error for invalid password formats
5262 Version v1.7.1.4; changes since v1.7.1.3:
5263 -----------------------------------------
5266 gitweb: Introduce esc_attr to escape attributes of HTML elements
5272 Version v1.7.1.3; changes since v1.7.1.2:
5273 -----------------------------------------
5275 Jonathan Nieder (1):
5276 add: introduce add.ignoreerrors synonym for add.ignore-errors
5282 t0003: add missing && at end of lines
5285 Version v1.7.1.2; changes since v1.7.1.1:
5286 -----------------------------------------
5289 t/README: clarify test_must_fail description
5292 Documentation/git-gc.txt: add reference to githooks
5295 Documentation: Explain git-mergetool's use of temporary files
5298 xdiff: optimise for no whitespace difference when ignoring whitespace.
5300 Fredrik Skolmli (1):
5301 Documentation: Spelling fix in protocol-capabilities.txt
5304 Check size of path buffer before writing into it
5305 Check size of path buffer before writing into it
5308 add missing && to submodule-merge testcase
5311 receive-pack: switch global variable 'commands' to a parameter
5312 receive-pack: detect aliased updates which can occur with symrefs
5315 t0006: test timezone parsing
5316 test-date: fix sscanf type conversion
5319 t0005: work around strange $? in ksh when program terminated by a signal
5321 Jonathan Nieder (3):
5322 gitmodules.5: url can be a relative path
5323 Documentation: add submodule.* to the big configuration variable list
5324 config --get --path: check for unset $HOME
5327 backmerge a few more fixes to 1.7.1.X series
5331 Michael J Gruber (3):
5332 git-rev-parse.txt: Document ":path" specifier
5333 git-rev-parse.txt: Add more examples for caret and colon
5334 rerere.txt: Document forget subcommand
5337 format-patch: document the format.to configuration setting
5339 Nicolas Sebrecht (1):
5340 checkout: accord documentation to what git does
5343 git fetch documentation: describe short '-p' synonym to '--prune' option
5345 Pavan Kumar Sunkara (1):
5348 Pierre Habouzit (1):
5349 fix git branch -m in presence of cross devices
5352 update-server-info: Shorten read_pack_info_file()
5355 request-pull.txt: Document -p option
5358 check_aliased_update: strcpy() instead of strcat() to copy
5360 Uwe Kleine-König (1):
5361 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
5364 Version v1.7.1.1; changes since v1.7.1:
5365 ---------------------------------------
5367 Alexey Mahotkin (1):
5368 xdiff/xmerge.c: use memset() instead of explicit for-loop
5371 diff: fix coloring of extended diff headers
5373 Björn Gustavsson (1):
5374 apply: Allow blank *trailing* context lines to match beyond EOF
5376 Björn Steinbrink (1):
5377 diff: Support visibility modifiers in the PHP hunk header regexp
5380 blame-options.txt: Add default value for `-M/-C` options.
5383 t/t9001: use egrep when regular expressions are involved
5386 unpack-trees: Make index lookahead less pessimal
5388 Brian Gernhardt (4):
5389 send-email: Cleanup { style
5390 send-email: Don't use FQDNs without a '.'
5391 Document send-email --smtp-domain
5392 send-email: Cleanup smtp-domain and add config
5395 stash: Don't overwrite files that have gone from the index
5396 stash tests: stash can lose data in a file removed from the index
5399 exec_cmd.c: replace hard-coded path list with one from <paths.h>
5401 Christian Couder (3):
5402 diff: fix "git show -C -C" output when renaming a binary file
5403 commit: use value of GIT_REFLOG_ACTION env variable as reflog message
5404 Documentation: grep: fix asciidoc problem with --
5406 Clemens Buchacher (7):
5407 do not overwrite files marked "assume unchanged"
5408 Documentation: git-add does not update files marked "assume unchanged"
5409 test get_git_work_tree() return value for NULL
5410 get_cwd_relative(): do not misinterpret suffix as subdirectory
5411 setup: document prefix
5412 quote.c: separate quoting and relative path generation
5413 ls-files: allow relative pathspec
5416 hash_object: correction for zero length file
5418 Gary V. Vaughan (1):
5419 git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX
5422 git-submodule.sh: properly initialize shell variables
5424 Henrik Grubbström (3):
5425 attr: Fixed debug output for macro expansion.
5426 attr: Allow multiple changes to an attribute on the same line.
5427 attr: Expand macros immediately when encountered.
5430 Fix "Out of memory? mmap failed" for files larger than 4GB on Windows
5432 Ian Ward Comfort (1):
5433 rebase -i: Abort cleanly if new base cannot be checked out
5436 autoconf: Check if <paths.h> exists and set HAVE_PATHS_H
5439 commit.txt: clarify how --author argument is used
5440 am: use get_author_ident_from_commit instead of mailinfo when rebasing
5441 gitweb/Makefile: fix typo in gitweb.min.css rule
5444 handle "git --bare init <dir>" properly
5445 docs: clarify meaning of -M for git-log
5446 remove over-eager caching in sha1_file_name
5447 pull: do nothing on --dry-run
5448 commit: give advice on empty amend
5449 Makefile: default pager on AIX to "more"
5450 notes: check number of parameters to "git notes copy"
5453 Thread-safe xmalloc and xrealloc needs a recursive mutex
5455 Jonathan Nieder (25):
5456 t7006: guard cleanup with test_expect_success
5457 t5704 (bundle): add tests for bundle --stdin
5458 fix "bundle --stdin" segfault
5459 test-lib: Let tests specify commands to be run at end of test
5460 commit --amend: cope with missing display name
5461 Documentation/shortlog: scripted users should not rely on implicit HEAD
5462 t4201 (shortlog): guard setup with test_expect_success
5463 t4201 (shortlog): Test output format with multiple authors
5464 shortlog: Document and test --format option
5465 test-lib: some shells do not let $? propagate into an eval
5466 cherry-pick: do not dump core when iconv fails
5467 Documentation/notes: document format of notes trees
5468 Documentation/notes: describe content of notes blobs
5469 Documentation/notes: add configuration section
5470 Documentation/notes: simplify treatment of default notes ref
5471 Documentation/log: add a CONFIGURATION section
5472 Documentation/notes: simplify treatment of default display refs
5473 Documentation/notes: clean up description of rewriting configuration
5474 Documentation/notes: nitpicks
5475 post-receive-email: document command-line mode
5476 Documentation/checkout: clarify description
5477 gitignore.5: Clarify matching rules
5478 rebase -i -p: document shortcomings
5479 Documentation/checkout: clarify description
5480 add-interactive: Clarify “remaining hunks in the file”
5482 Junio C Hamano (10):
5483 am -3: recover the diagnostic messages for corrupt patches
5484 clone: quell the progress report from init and report on clone
5485 t9129: fix UTF-8 locale detection
5486 common_prefix: simplify and fix scanning for prefixes
5487 Prepare draft release notes to 1.7.1.1
5488 Update draft release notes to 1.7.1.1
5489 tests: remove unnecessary '^' from 'expr' regular expression
5490 Update draft release notes to 1.7.1.1
5491 Update draft release notes to 1.7.1.1
5494 Leif Arne Storset (1):
5495 Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRef
5497 Marcus Comstedt (1):
5498 Add "Z" as an alias for the timezone "UTC"
5500 Markus Heidelberg (4):
5501 t7508: add test for "git status" refreshing the index
5502 git status: refresh the index if possible
5503 t7508: add a test for "git status" in a read-only repository
5504 Documentation: rebase -i ignores options passed to "git am"
5506 Michael J Gruber (10):
5507 index-pack: fix trivial typo in usage string
5508 t7508: test advice.statusHints
5509 wt-status: take advice.statusHints seriously
5510 Documentation: fix minor inconsistency
5511 Documentation/gitdiffcore: fix order in pickaxe description
5512 Documentation/SubmittingPatches: clarify GMail section and SMTP
5513 completion: --set-upstream option for git-branch
5514 Makefile: reenable install with NO_CURL
5515 Documentation/config: describe status.submodulesummary
5516 Documentation: A...B shortcut for checkout and rebase
5519 test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.
5522 Documentation/pretty-{formats,options}: better reference for "format:<string>"
5525 Make xmalloc and xrealloc thread-safe
5526 index-pack: smarter memory usage when resolving deltas
5527 index-pack: rationalize unpack_entry_data()
5528 index-pack: smarter memory usage when appending objects
5531 clone: reword messages to match the end-user perception
5533 Peter Collingbourne (4):
5534 Generalise the unlink_or_warn function
5535 Implement the rmdir_or_warn function
5536 Introduce remove_or_warn function
5537 Remove a redundant errno test in a usage of remove_path
5539 Philippe Bruhat (1):
5540 Git.pm: better error message
5543 Documentation/git-send-email: Add "Use gmail as the smtp server"
5545 Ramkumar Ramachandra (1):
5546 SubmittingPatches: Add new section about what to base work on
5548 Ramsay Allan Jones (4):
5549 Makefile: Fix 'clean' target to remove all gitweb build files
5550 msvc: Fix some "expr evaluates to function" compiler warnings
5551 msvc: Fix some compiler warnings
5552 notes: Initialise variable to appease gcc
5555 git diff too slow for a file
5556 remove ecb parameter from xdi_diff_outf()
5557 Fix checkout of large files to network shares on Windows XP
5560 Prompt for a username when an HTTP request 401s
5562 Shawn O. Pearce (16):
5563 tag.c: Correct indentation
5564 tag.h: Remove unused signature field
5565 tag.c: Refactor parse_tag_buffer to be saner to program
5566 tag.c: Parse tagger date (if present)
5567 describe: Break annotated tag ties by tagger date
5568 http.c: Remove bad free of static block
5569 t5550-http-fetch: Use subshell for repository operations
5570 http.c: Tiny refactoring of finish_http_pack_request
5571 http.c: Drop useless != NULL test in finish_http_pack_request
5572 http.c: Don't store destination name in request structures
5573 http.c: Remove unnecessary strdup of sha1_to_hex result
5574 Introduce close_pack_index to permit replacement
5575 Extract verify_pack_index for reuse from verify_pack
5576 Allow parse_pack_index on temporary files
5577 http-fetch: Use index-pack rather than verify-pack to check packs
5578 http-fetch: Use temporary files for pack-*.idx until verified
5580 Sverre Rabbelier (1):
5581 Gitweb: ignore built file
5584 t5541-http-push: add test for URLs with trailing slash
5585 http: make end_url_with_slash() public
5586 remote-curl: ensure that URLs have a trailing slash
5587 http.c::new_http_pack_request: do away with the temp variable filename
5588 t7604-merge-custom-message: shift expected output creation
5589 t7604-merge-custom-message: show that --log doesn't append to -m
5590 merge: update comment
5591 merge: rename variable
5592 fmt-merge-msg: minor refactor of fmt_merge_msg()
5593 fmt-merge-msg: refactor merge title formatting
5594 fmt-merge-msg: add function to append shortlog only
5595 merge: --log appends shortlog to message if specified
5596 GIT-VERSION-GEN: restrict tags used
5597 t7502-commit: fix spelling
5598 show-branch: use DEFAULT_ABBREV instead of 7
5599 t7502-commit: add tests for summary output
5600 t7502-commit: add summary output tests for empty and merge commits
5601 commit::print_summary(): don't use format_commit_message()
5604 t/README: document --root option
5605 send-email: ask about and declare 8bit mails
5608 Documentation/SubmittingPatches: Fix typo in GMail section
5611 Change C99 comments to old-style C comments
5614 pretty: Respect --abbrev option
5617 git-mailinfo documentation: clarify -u/--encoding
5620 start_command: close cmd->err descriptor when fork/spawn fails
5622 Ævar Arnfjörð Bjarmason (3):
5623 Move t6000lib.sh to lib-*
5624 Turn setup code in t2007-checkout-symlink.sh into a test
5625 notes: Initialize variable to appease Sun Studio
5628 Version v1.7.1; changes since v1.7.1-rc2:
5629 -----------------------------------------
5632 Documentation improvements for the description of short format.
5635 MSVC: Fix build by adding missing termios.h dummy
5637 Jonathan Nieder (1):
5638 Documentation/Makefile: fix interrupted builds of user-manual.xml
5644 Michael J Gruber (1):
5645 t7012: Mark missing tests as TODO
5648 reflog: remove 'show' from 'expire's usage string
5651 Version v1.7.1-rc2; changes since v1.7.1-rc1:
5652 ---------------------------------------------
5655 Documentation: Describe other situations where -z affects git diff
5658 git-instaweb: pass through invoking user's path to gitweb CGI scripts
5661 Documentation/config.txt: default gc.aggressiveWindow is 250, not 10
5664 diff: use large integers for diffstat calculations
5665 rebase-interactive: silence warning when no commits rewritten
5668 gitk: Add Ctrl-W shortcut for closing the active window
5669 gitk: Display dirty submodules correctly
5671 Johannes Gilger (1):
5672 pretty: Initialize notes if %N is used
5675 Windows: start_command: Support non-NULL dir in struct child_process
5677 Jonathan Nieder (5):
5678 gitk: Add comments to explain encode_view_opts and decode_view_opts
5679 gitk: Don't clobber "Remember this view" setting
5680 Add .depend directories to .gitignore
5681 Document new "already-merged" rule for branch -d
5682 tag -v: use RUN_GIT_CMD to run verify-tag
5685 SubmittingPatches: update GMail section
5686 blame documentation: -M/-C notice copied lines as well as moved ones
5688 gitweb: simplify gitweb.min.* generation and clean-up rules
5689 t3301: add tests to use --format="%N"
5693 Docs: Add -X option to git-merge's synopsis.
5696 gitk: Remove forced use of sans-serif font
5697 gitk: Set the font for all spinbox widgets
5698 gitk: Set the font for all listbox widgets
5699 gitk: Use consistent font for all text input fields
5701 Matthew Ogilvie (1):
5702 t6006: do not write to /tmp
5704 Michael J Gruber (1):
5705 t1010-mktree: Adjust expected result to code and documentation
5708 gitk: Avoid calling tk_setPalette on Windows
5709 gitk: Add emacs editor variable block
5710 gitk: Fix display of copyright symbol
5712 Ramkumar Ramachandra (5):
5713 Documentation/remote-helpers: Rewrite description
5714 Documentation/urls: Rewrite to accomodate <transport>::<address>
5715 Documentation/remote-helpers: Add invocation section
5716 Fixup: Second argument may be any arbitrary string
5717 Documentation/remote-helpers: Fix typos and improve language
5720 t3507: Make test executable
5723 combined diff: correctly handle truncated file
5726 documentation: clarify direction of core.autocrlf
5729 Version v1.7.1-rc1; changes since v1.7.1-rc0:
5730 ---------------------------------------------
5733 notes.h: declare bit field as unsigned to silence compiler complaints
5736 fix const-correctness of write_sha1_file
5737 fix textconv leak in emit_rewrite_diff
5738 fix typos and grammar in 1.7.1 draft release notes
5739 docs: clarify "branch -l"
5742 Let check_preimage() use memset() to initialize "struct checkout"
5743 Teach diff --submodule and status to handle .git files in submodules
5745 Jonathan Nieder (1):
5746 Teach mailinfo %< as an alternative scissors mark
5749 diff.c: work around pointer constness warnings
5753 Gitweb: add ignore and clean rules for minified files
5754 Gitweb: add support for minifying gitweb.css
5755 Gitweb: add autoconfigure support for minifiers
5756 instaweb: add minification awareness
5757 gitweb: add documentation to INSTALL regarding gitweb.js
5758 gitweb: update INSTALL to use shorter make target
5760 Michael J Gruber (2):
5761 t3301-notes: Test the creation of reflog entries
5762 refs.c: Write reflogs for notes just like for branch heads
5765 branch: say "Reset to" in reflog entries for 'git branch -f' operations
5766 fetch/push: fix usage strings
5769 Version v1.7.1-rc0; changes since v1.7.0.9:
5770 -------------------------------------------
5773 cvsimport: new -R option: generate .git/cvs-revisions mapping
5776 everyday: fsck and gc are not everyday operations
5779 Make templates honour SHELL_PATH and PERL_PATH
5780 Modernize git calling conventions in hook templates
5782 Benjamin C Meyer (1):
5783 Fix a spelling mistake in a git-p4 console message
5786 make union merge an xdl merge favor
5787 refactor merge flags into xmparam_t
5788 merge-file: add option to specify the marker size
5789 merge-file: add option to select union merge favor
5792 t/t1304: avoid -d option to setfacl
5793 t/t1304: set the Default ACL base entries
5794 t/t1304: use 'test -r' to test readability rather than looking at mode bits
5795 t/t1304: set the ACL effective rights mask
5796 t/t1304: make a second colon optional in the mask ACL check
5797 notes.c: remove inappropriate call to return
5798 t5505: remove unnecessary subshell invocations
5799 t5505: add missing &&
5800 t/t5505-remote.sh: escape * to prevent interpretation by shell as glob
5802 Brian Gernhardt (1):
5803 Use test_expect_success for test setups
5806 imap-send: suppress warning about cleartext password with CRAM-MD5
5808 Christian Couder (8):
5809 reset: add option "--keep" to "git reset"
5810 reset: add test cases for "--keep" option
5811 Documentation: reset: describe new "--keep" option
5812 reset: disallow "reset --keep" outside a work tree
5813 reset: disallow using --keep when there are unmerged entries
5814 cherry-pick: add tests for new --ff option
5815 Documentation: describe new cherry-pick --ff option
5816 rebase -i: use new --ff cherry-pick option
5819 rebase--interactive: don't require what's rebased to be a branch
5822 Makefile: update defaults for modern Cygwin
5825 Integrate version 3 ciabot scripts into contrib/.
5828 hash-object: support --stdin-paths with --no-filters
5829 git-svn: support fetch with autocrlf on
5830 Revert "git-svn: always initialize with core.autocrlf=false"
5831 cherry: support --abbrev option
5832 ls: remove redundant logic
5835 fallback SSH_ASKPASS when GIT_ASKPASS not set
5836 git-svn: Support retrieving passwords with GIT_ASKPASS
5837 git-core: Support retrieving passwords with GIT_ASKPASS
5840 imap-send: support CRAM-MD5 authentication
5842 Ian Ward Comfort (1):
5843 RPM spec: include bash completion support
5845 Ilari Liusvaara (1):
5846 Allow '+', '-' and '.' in remote helper names
5849 gitweb: esc_html (short) error message in die_error
5850 gitweb: Protect escaping functions against calling on undef
5853 git-send-email.perl: improve error message in send_message()
5854 git-send-email.perl: add option --smtp-debug
5855 git-send-email.perl - try to give real name of the calling host to HELO/EHLO
5858 submodule summary: do not shift a non-existent positional variable
5861 git diff --submodule: Show detailed dirty status of submodules
5862 git status: Show detailed dirty status of submodules in long format
5863 git submodule summary: Handle HEAD as argument when on an unborn branch
5864 Refactor dirty submodule detection in diff-lib.c
5865 git status: Fix false positive "new commits" output for dirty submodules
5866 git status: ignoring untracked files must apply to submodules too
5869 Minor cosmetic fixes to notes.c
5870 Notes API: get_commit_notes() -> format_note() + remove the commit restriction
5871 Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
5872 Notes API: init_notes(): Initialize the notes tree from the given notes ref
5873 Notes API: add_note(): Add note objects to the internal notes tree structure
5874 Notes API: remove_note(): Remove note objects from the notes tree structure
5875 Notes API: get_note(): Return the note annotating the given object
5876 Notes API: for_each_note(): Traverse the entire notes tree with a callback
5877 Notes API: write_notes_tree(): Store the notes tree in the database
5878 Notes API: Allow multiple concurrent notes trees with new struct notes_tree
5879 Refactor notes concatenation into a flexible interface for combining notes
5880 Builtin-ify git-notes
5881 t3301: Verify successful annotation of non-commits
5882 t3305: Verify that adding many notes with git-notes triggers increased fanout
5883 Teach notes code to properly preserve non-notes in the notes tree
5884 Teach builtin-notes to remove empty notes
5885 builtin-notes: Add "remove" subcommand for removing existing notes
5886 t3305: Verify that removing notes triggers automatic fanout consolidation
5887 Notes API: prune_notes(): Prune notes that belong to non-existing objects
5888 builtin-notes: Add "prune" subcommand for removing notes for missing objects
5889 Documentation: Generalize git-notes docs to 'objects' instead of 'commits'
5890 builtin-notes: Add "list" subcommand for listing note objects
5891 builtin-notes: Add --message/--file aliases for -m/-F options
5892 builtin-notes: Add "add" subcommand for adding notes to objects
5893 builtin-notes: Add "append" subcommand for appending to note objects
5894 builtin-notes: Deprecate the -m/-F options for "git notes edit"
5895 builtin-notes: Refactor handling of -F option to allow combining -m and -F
5896 builtin-notes: Add -c/-C options for reusing notes
5897 builtin-notes: Misc. refactoring of argc and exit value handling
5898 builtin-notes: Add "copy" subcommand for copying notes between objects
5899 submodule summary: Don't barf when invoked in an empty repo
5900 builtin-notes: Minor (mostly parse_options-related) fixes
5903 Print RUNTIME_PREFIX warning only when GIT_TRACE is set
5904 Windows: redirect f[re]open("/dev/null") to f[re]open("nul")
5906 Jonathan Nieder (33):
5907 Makefile: add missing header file dependencies
5908 Makefile: make sure test helpers are rebuilt when headers change
5909 Makefile: remove wt-status.h from LIB_H
5910 Makefile: clean up http-walker.o dependency rules
5911 Makefile: drop dependency on $(wildcard */*.h)
5912 Makefile: transport.o depends on branch.h now
5913 Makefile: rearrange dependency rules
5914 Makefile: disable default implicit rules
5915 Makefile: list generated object files in OBJECTS
5916 Makefile: lazily compute header dependencies
5917 Makefile: list standalone program object files in PROGRAM_OBJS
5918 Teach Makefile to check header dependencies
5919 Do not install shell libraries executable
5920 Makefile: tuck away generated makefile fragments in .depend
5921 Makefile: always remove .depend directories on 'make clean'
5922 Makefile: clarify definition of TEST_OBJS
5923 Makefile: Fix occasional GIT-CFLAGS breakage
5924 revert: fix tiny memory leak in cherry-pick --ff
5925 tests: document format of conflicts from checkout -m
5926 tests: document cherry-pick behavior in face of conflicts
5927 xdl_merge(): add optional ancestor label to diff3-style output
5928 xdl_merge(): move file1 and file2 labels to xmparam structure
5929 merge-file --diff3: add a label for ancestor
5930 ll_merge(): add ancestor label parameter for diff3-style output
5931 checkout --conflict=diff3: add a label for ancestor
5932 merge_file(): add comment explaining behavior wrt conflict style
5933 merge_trees(): add ancestor label parameter for diff3-style output
5934 checkout -m --conflict=diff3: add a label for ancestor
5935 compat: add mempcpy()
5936 revert: clarify label on conflict hunks
5937 cherry-pick, revert: add a label for ancestor
5938 merge-recursive: add a label for ancestor
5939 Makefile: future-proof Cygwin version check
5941 Junio C Hamano (25):
5942 builtin-for-each-ref.c: comment fixes
5943 builtin-for-each-ref.c: check if we need to peel onion while parsing the format
5944 for-each-ref --format='%(symref) %(symref:short)'
5945 for-each-ref --format='%(flag)'
5947 Resurrect "git grep --no-index"
5948 Update draft release notes to 1.7.1
5949 notes: fix malformed tree entry
5950 wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR
5951 submodule summary: do not fail before the first commit
5952 parse-options: add parse_options_concat() to concat options
5953 builtin/merge: make checkout_fast_forward() non static
5954 revert: add --ff option to allow fast forward when cherry-picking
5955 Update draft release notes to 1.7.1
5956 Documentation: improve description of "git reset --keep"
5957 t4013: add tests for log -p -m --first-parent
5958 revision: introduce setup_revision_opt
5959 show -c: show patch text
5960 show --first-parent/-m: do not default to --cc
5961 Makefile: update check-docs target
5962 t5516: Use test_cmp when appropriate
5963 Update draft release notes to 1.7.1
5964 Update draft release notes to 1.7.1
5965 Revert "Link against libiconv on IRIX"
5969 git-push: fix an advice message so it goes to stderr
5970 git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode
5971 git-push: make git push --porcelain print "Done"
5972 git-push: add tests for git push --porcelain
5975 Move 'builtin-*' into a 'builtin/' subdirectory
5978 Teach rebase the --no-ff option.
5981 Add an optional argument for --color options
5982 Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
5983 grep: Colorize filename, line number, and separator
5984 grep: Colorize selected, context, and function lines
5986 Markus Heidelberg (2):
5987 builtin/commit: fix duplicated sentence in a comment
5988 builtin/commit: remove unnecessary variable definition
5990 Michael J Gruber (4):
5991 git-svn: req_svn when needed
5992 t9119-git-svn-info.sh: test with svn 1.6.* as well
5993 Documentation: fix a few typos in git-notes.txt
5994 git-svn: make git svn --version work again
5996 Michael Lukashov (4):
5997 connect.c: move duplicated code to a new function 'get_host_and_port'
5998 refactor duplicated code in builtin-send-pack.c and transport.c
5999 refactor duplicated fill_mm() in checkout and merge-recursive
6000 refactor duplicated encode_header in pack-objects and fast-import
6002 Michele Ballabio (1):
6003 shortlog: warn the user when there is no input
6006 request-pull: avoid mentioning that the start point is a single commit
6008 Nguyễn Thái Ngọc Duy (5):
6009 make_absolute_path(): Do not append redundant slash
6010 init-db, rev-parse --git-dir: do not append redundant slash
6011 Move offset_1st_component() to path.c
6012 Support working directory located at root
6013 Add test for using Git at root of file system
6016 move encode_in_pack_object_header() to a better place
6019 git log -p -m: document -m and honor --first-parent
6022 setenv(GIT_DIR) clean-up
6023 grep: enable threading for context line printing
6026 bash: improve aliased command recognition
6027 bash: support user-supplied completion scripts for user's git commands
6028 bash: support user-supplied completion scripts for aliases
6029 bash: completion for gitk aliases
6032 documentation: 'git-mailsplit --keep-cr' is not hidden anymore
6033 git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit
6034 git-am: Add am.keepcr and --no-keep-cr to override it
6035 git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`
6038 format-patch: use a string_list for headers
6039 format-patch: add --no-cc, --no-to, and --no-add-headers
6040 send-email: add --no-cc, --no-to, and --no-bcc
6041 notes: rework subcommands and parse options
6042 fmt-merge-msg: be quiet if nothing to merge
6043 t6200: modernize with test_tick
6044 t6200: test fmt-merge-msg more
6045 fmt-merge-msg: use pretty.c routines
6046 string-list: add unsorted_string_list_lookup()
6047 fmt-merge-msg: remove custom string_list implementation
6048 fmt-merge-msg: hide summary option
6051 Add `init.templatedir` configuration variable.
6052 Add a "TEMPLATE DIRECTORY" section to git-init[1].
6053 init: having keywords without value is not a global error.
6054 t/t0001-init.sh: add test for 'init with init.templatedir set'
6055 Add 'git format-patch --to=' option and 'format.to' configuration variable.
6058 Documentation/git-clone: mention progress in -v
6059 Documentation/git-pull: put verbosity options before merge/fetch ones
6060 Documentation/git-push: put --quiet before --verbose
6061 fetch: refactor verbosity option handling into transport.[ch]
6062 push: support multiple levels of verbosity
6063 clone: support multiple levels of verbosity
6064 transport->progress: use flag authoritatively
6065 push: learn --progress
6066 fetch and pull: learn --progress
6067 transport: update flags to be in running order
6068 t5541-http-push: check that ref is unchanged for non-ff test
6069 t554[01]-http-push: refactor, add non-ff tests
6070 http-push: remove "|| 1" to enable verbose check
6071 http-walker: cleanup more thoroughly
6072 http: init and cleanup separately from http-walker
6073 remote-curl: use http_fetch_ref() instead of walker wrapper
6074 remote-curl: init walker only when needed
6077 test-lib: unset GIT_NOTES_REF to stop it from influencing tests
6078 Support showing notes from more than one notes tree
6079 Documentation: document post-rewrite hook
6080 commit --amend: invoke post-rewrite hook
6081 rebase: invoke post-rewrite hook
6082 rebase -i: invoke post-rewrite hook
6083 notes: implement 'git notes copy --stdin'
6084 notes: implement helpers needed for note copying during rewrite
6085 rebase: support automatic notes copying
6086 commit --amend: copy notes to the new commit
6087 notes: add shorthand --ref to override GIT_NOTES_REF
6088 notes: track whether notes_trees were changed at all
6089 git-notes(1): add a section about the meaning of history
6090 rebase -i: make post-rewrite work for 'edit'
6093 t9151: Fix a few commits in the SVN dump
6094 t9151: Add two new svn:mergeinfo test cases
6095 git-svn: Fix discarding of extra parents from svn:mergeinfo
6096 git-svn: Fix merge detecting with rewrite-root
6097 t9150,t9151: Add rewrite-root option to init
6099 YONETANI Tomokazu (1):
6100 Fix _XOPEN_SOURCE problem on DragonFly
6103 git svn: delay importing SVN::Base until it is needed
6106 Version v1.7.0.9; changes since v1.7.0.8:
6107 -----------------------------------------
6110 gitweb: Introduce esc_attr to escape attributes of HTML elements
6116 Version v1.7.0.8; changes since v1.7.0.7:
6117 -----------------------------------------
6119 Jonathan Nieder (1):
6120 add: introduce add.ignoreerrors synonym for add.ignore-errors
6126 Version v1.7.0.7; changes since v1.7.0.6:
6127 -----------------------------------------
6130 Documentation improvements for the description of short format.
6133 git-submodule.sh: properly initialize shell variables
6136 Check size of path buffer before writing into it
6138 Jonathan Nieder (1):
6139 config --get --path: check for unset $HOME
6144 Michael J Gruber (3):
6145 index-pack: fix trivial typo in usage string
6146 Makefile: reenable install with NO_CURL
6147 Documentation/config: describe status.submodulesummary
6150 remove ecb parameter from xdi_diff_outf()
6153 request-pull.txt: Document -p option
6155 Uwe Kleine-König (1):
6156 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
6159 Version v1.7.0.6; changes since v1.7.0.5:
6160 -----------------------------------------
6163 Documentation: Describe other situations where -z affects git diff
6166 Makefile: Remove usage of deprecated Python "has_key" method
6169 Documentation/config.txt: default gc.aggressiveWindow is 250, not 10
6172 diff: use large integers for diffstat calculations
6175 MSVC: Fix build by adding missing termios.h dummy
6177 Jonathan Nieder (2):
6178 Document new "already-merged" rule for branch -d
6179 Documentation/Makefile: fix interrupted builds of user-manual.xml
6185 Docs: Add -X option to git-merge's synopsis.
6187 Michael J Gruber (3):
6188 rev-list: use default abbrev length when abbrev-commit is in effect
6189 t1010-mktree: Adjust expected result to code and documentation
6190 t7012: Mark missing tests as TODO
6193 reflog: remove 'show' from 'expire's usage string
6196 combined diff: correctly handle truncated file
6199 documentation: clarify direction of core.autocrlf
6202 Version v1.7.0.5; changes since v1.7.0.4:
6203 -----------------------------------------
6206 daemon.c: avoid accessing ss_family member of struct sockaddr_storage
6209 rev-list: fix --pretty=oneline with empty message
6212 Improve error messages from 'git stash show'
6215 docs: clarify "branch -l"
6218 Let check_preimage() use memset() to initialize "struct checkout"
6221 diff --check: honor conflict-marker-size attribute
6222 blame documentation: -M/-C notice copied lines as well as moved ones
6225 Michael J Gruber (2):
6226 .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
6227 send-email: lazily assign editor variable
6229 R. Tyler Ballance (1):
6230 Correct references to /usr/bin/python which does not exist on FreeBSD
6232 Ramkumar Ramachandra (1):
6233 imap-send: Remove limitation on message body
6235 Shawn O. Pearce (1):
6236 http-backend: Don't infinite loop during die()
6239 pack-protocol.txt: fix spelling
6240 pack-protocol.txt: fix pkt-line lengths
6241 branch: say "Reset to" in reflog entries for 'git branch -f' operations
6242 fetch/push: fix usage strings
6245 Version v1.7.0.4; changes since v1.7.0.3:
6246 -----------------------------------------
6248 Björn Gustavsson (5):
6249 apply: Don't unnecessarily update line lengths in the preimage
6250 apply: Remove the quick rejection test
6251 apply: Allow blank context lines to match beyond EOF
6252 t4124: Add additional tests of --whitespace=fix
6253 t3417: Add test cases for "rebase --whitespace=fix"
6256 test for add with non-existent pathspec
6259 difftool: Fix '--gui' when diff.guitool is unconfigured
6262 Documentation: Clarify support for smart HTTP backend
6265 Don't redefine htonl and ntohl on big-endian
6266 Link against libiconv on IRIX
6267 Documentation: show-ref <pattern>s are optional
6270 gitweb: git_get_project_config requires only $git_dir, not also $project
6273 Updated the usage string of git reset
6276 dir: fix COLLECT_IGNORED on excluded prefixes
6279 diff: fix textconv error zombies
6280 Windows: fix utime() for read-only files
6283 git add -u: die on unmatched pathspec
6284 color: allow multiple attributes
6285 t0050: mark non-working test as such
6286 tests for "git add ignored-dir/file" without -f
6287 refs: ref entry with NULL sha1 is can be a dangling symref
6288 t9350: fix careless use of "cd"
6293 format-patch: Squelch 'fatal: Not a range." error
6295 Markus Heidelberg (1):
6296 Documentation: explain the meaning of "-g" in git-describe output
6298 Sverre Rabbelier (1):
6299 fast-export: don't segfault when marks file cannot be opened
6302 Version v1.7.0.3; changes since v1.7.0.2:
6303 -----------------------------------------
6306 prune: honor --expire=never
6307 reflog: honor gc.reflogexpire=never
6309 Andreas Gruenbacher (3):
6310 fetch: Check for a "^{}" suffix with suffixcmp()
6311 fetch: Future-proof initialization of a refspec on stack
6312 fetch: Fix minor memory leak
6315 don't use default revision if a rev was specified
6317 Filippo Negroni (1):
6318 Fix gitmkdtemp: correct test for mktemp() return value
6320 Giuseppe Bilotta (5):
6321 Refactor list of of repo-local env vars
6322 rev-parse: --local-env-vars option
6323 shell setup: clear_local_git_env() function
6324 submodules: ensure clean environment when operating in a submodule
6325 is_submodule_modified(): clear environment properly
6327 Ian Ward Comfort (1):
6328 bash: complete *_HEAD refs if present
6331 daemon: parse_host_and_port SIGSEGV if port is specified
6334 add-interactive: fix bogus diff header line ordering
6335 push: fix segfault for odd config
6337 Jonathan Nieder (1):
6338 Makefile: Fix CDPATH problem
6340 Junio C Hamano (12):
6341 "log --author=me --grep=it" should find intersection, not union
6342 Reword "detached HEAD" notification
6343 mailinfo: do not strip leading spaces even for a header line
6344 t5521: fix and modernize
6345 builtin-fetch --all/--multi: propagate options correctly
6346 fetch --all/--multiple: keep all the fetched branch information
6347 pack-objects documentation: reword "objects that appear in the standard input"
6348 Merge accumulated fixes to prepare for 1.7.0.3
6349 t9400: Use test_cmp when appropriate
6350 t/Makefile: remove test artifacts upon "make clean"
6351 Update draft release notes to 1.7.0.3
6355 grep docs: pluralize "Example" section
6356 grep docs: use AsciiDoc literals consistently
6357 grep docs: --cached and <tree>... are incompatible
6358 grep docs: document --no-index option
6361 Add a testcase for ACL with restrictive umask.
6362 Move gitmkstemps to path.c
6363 git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.
6364 Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.
6365 git_mkstemps_mode: don't set errno to EINVAL on exit.
6366 Use git_mkstemp_mode instead of plain mkstemp to create object files
6368 Michael J Gruber (7):
6369 Documentation/git-read-tree: fix table layout
6370 Documentation/git-read-tree: clarify 2-tree merge
6371 Documentation/git-reflog: Fix formatting of command lists
6372 Documentation/gitdiffcore: Remove misleading date in heading
6373 Documentation/urls: Remove spurious example markers
6374 Documentation/git-clone: Transform description list into item list
6375 .mailmap: Map the the first submissions of MJG by e-mail
6378 run-command.c: fix build warnings on Ubuntu
6381 Documentation: pack-objects: Clarify --local's semantics.
6382 pack-objects documentation: Fix --honor-pack-keep as well.
6385 blame: fix indent of line numbers
6386 for_each_recent_reflog_ent(): use strbuf, fix offset handling
6389 pull: replace unnecessary sed invocation
6392 Documentation: receive.denyCurrentBranch defaults to 'refuse'
6395 Version v1.7.0.2; changes since v1.7.0.1:
6396 -----------------------------------------
6399 unset GREP_OPTIONS in test-lib.sh
6401 Christian Couder (1):
6402 bisect: error out when passing bad path parameters
6405 hash-object: don't use mmap() for small files
6408 run-command: support custom fd-set in async
6411 require_work_tree broken with NONGIT_OK
6414 git-imap-send: Convert LF to CRLF before storing patch to draft box
6417 gitweb: Die if there are parsing errors in config file
6418 gitweb: Fix project-specific feature override behavior
6420 Jonathan Nieder (8):
6421 Fix 'git var' usage synopsis
6422 Make 'git var GIT_PAGER' always print the configured pager
6423 git.1: Clarify the behavior of the --paginate option
6424 git svn: Fix launching of pager
6425 am: Fix launching of pager
6426 tests: Add tests for automatic use of pager
6427 t7006-pager: if stdout is not a terminal, make a new one
6428 tests: Fix race condition in t7006-pager
6431 t6000lib: Fix permission
6432 lib-patch-mode.sh: Fix permission
6433 status: preload index to optimize lstat(2) calls
6434 Start preparing for 1.7.0.2
6435 Update draft release notes to 1.7.0.2
6439 git diff --quiet -w: check and report the status
6440 git-diff: add a test for git diff --quiet -w
6443 stash: suggest the correct command line for unknown options.
6446 Remove extra '-' from git-am(1)
6449 fast-import: start using struct pack_idx_entry
6450 fast-import: use sha1write() for pack data
6451 fast-import: use write_idx_file() instead of custom code
6452 fast-import: make default pack size unlimited
6453 fast-import: honor pack.indexversion and pack.packsizelimit config vars
6454 fast-import: use the diff_delta() max_delta_size argument
6455 sha1_file: don't malloc the whole compressed result when writing out objects
6456 sha1_file: be paranoid when creating loose objects
6459 utf8.c: remove print_wrapped_text()
6460 utf8.c: remove print_spaces()
6461 utf8.c: remove strbuf_write()
6462 utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
6464 Shawn O. Pearce (7):
6465 run-command: Allow stderr to be a caller supplied pipe
6466 send-pack: demultiplex a sideband stream with status data
6467 receive-pack: Refactor how capabilities are shown to the client
6468 receive-pack: Wrap status reports inside side-band-64k
6469 receive-pack: Send hook output over side band #2
6470 t5401: Use a bare repository for the remote peer
6471 receive-pack: Send internal errors over side-band #2
6474 t7406: Fix submodule init config tests
6477 gitweb multiple project roots documentation
6480 transport: add got_remote_refs flag
6483 cherry_pick_list: quit early if one side is empty
6486 Version v1.7.0.1; changes since v1.7.0:
6487 ---------------------------------------
6490 Documentation: mention conflict marker size argument (%L) for merge driver
6491 rerere: fix memory leak if rerere images can't be read
6494 git-p4: fix bug in symlink handling
6497 Documentation: Fix indentation problem in git-commit(1)
6500 accept "git grep -- pattern"
6501 cherry-pick: rewrap advice message
6502 cherry-pick: refactor commit parsing code
6503 cherry-pick: format help message as strbuf
6504 cherry-pick: show commit name instead of sha1
6505 cherry-pick: prettify the advice message
6506 dwim_ref: fix dangling symref warning
6507 docs: don't talk about $GIT_DIR/refs/ everywhere
6508 rm: fix bug in recursive subdirectory removal
6511 t3301-notes: insert a shbang line in ./fake_editor.sh
6513 Jonathan Nieder (1):
6514 am: remove rebase-apply directory before gc
6517 Typofixes outside documentation area
6518 Start 1.7.0 maintenance track
6519 Fix use of mutex in threaded grep
6520 Prepare 1.7.0.1 release notes
6521 Update 1.7.0.1 release notes
6525 diff: make sure --output=/bad/path is caught
6528 grep documentation: clarify what files match
6529 Remove reference to GREP_COLORS from documentation
6531 Markus Heidelberg (1):
6532 sha1_name: fix segfault caused by invalid index access
6535 commit: quote the user name in the example
6538 Remove hyphen from "git-command" in two error messages
6541 fix minor memory leak in get_tree_entry()
6544 Documentation: describe --thin more accurately
6547 stash pop: remove 'apply' options during 'drop' invocation
6548 t1450: fix testcases that were wrongly expecting failure
6551 Version v1.7.0; changes since v1.7.0-rc2:
6552 -----------------------------------------
6554 Brian Gernhardt (1):
6555 t3902: Protect against OS X normalization
6558 filter-branch: Fix error message for --prune-empty --commit-filter
6561 blame: prevent a segv when -L given start > EOF
6564 am: switch --resolved to --continue
6566 Junio C Hamano (11):
6567 git-add documentation: Fix shell quoting example
6568 Fix parsing of imap.preformattedHTML and imap.sslverify
6569 git-push: document all the status flags used in the output
6570 check-ref-format documentation: fix enumeration mark-up
6571 t8003: check exit code of command and error message separately
6573 Update draft release notes to 1.7.0 one more time
6574 archive documentation: attributes are taken from the tree by default
6575 Re-fix check-ref-format documentation mark-up
6576 Fix typo in 1.6.6.2 release notes
6579 Michael J Gruber (1):
6580 Documentation: minor fixes to RelNotes-1.7.0
6583 Revert "pack-objects: fix pack generation when using pack_size_limit"
6586 bash: support 'git am's new '--continue' option
6589 Documentation: quote braces in {upstream} notation
6592 Version v1.7.0-rc2; changes since v1.7.0-rc1:
6593 ---------------------------------------------
6596 git-svn: persistent memoization
6599 configure: Allow GIT_ARG_SET_PATH to handle --without-PROGRAM
6600 configure: Allow --without-python
6602 Björn Gustavsson (1):
6603 bash: support the --autosquash option for rebase
6605 Brian Gernhardt (2):
6606 t9501: Skip testing load if we can't detect it
6607 t9501: Re-fix max load test
6609 Christian Stimming (1):
6610 git-gui: Update German translation (12 new or changed strings).
6613 Make NO_PTHREADS the sole thread configuration variable
6615 Emmanuel Trillaud (1):
6616 git-gui: update french translation
6618 Giuseppe Bilotta (4):
6619 git-gui: handle non-standard worktree locations
6620 git-gui: handle bare repos correctly
6621 git-gui: update shortcut tools to use _gitworktree
6622 git-gui: set GIT_DIR and GIT_WORK_TREE after setup
6625 git-gui: fix shortcut for menu "Commit/Revert Changes"
6628 gitweb: Make running t9501 test with '--debug' reliable and usable
6631 git-gui: Support applying a range of changes at once
6634 mention new shell execution behavior in release notes
6635 docs: fix filter-branch example for quoted paths
6636 Fix invalid read in quote_c_style_counted
6639 git-gui: Use git diff --submodule when available
6640 git-gui: Add a special diff popup menu for submodules
6641 git-gui: Quote git path when starting another gui in a submodule
6642 Fix memory leak in submodule.c
6643 Updates for dirty submodules in release notes and user manual
6645 John 'Warthog9' Hawley (7):
6646 gitweb: Load checking
6647 gitweb: Makefile improvements
6648 gitweb: Check that $site_header etc. are defined before using them
6649 gitweb: add a "string" variant of print_local_time
6650 gitweb: add a "string" variant of print_sort_th
6651 gitweb: Add optional extra parameter to die_error, for extended explanation
6652 gitweb: Simplify (and fix) chop_str
6655 RPM packaging: use %global inside %{!?...}
6656 Update draft release notes to 1.7.0
6657 build: make code "-Wpointer-arith" clean
6658 fast-import.c: Fix big-file-threshold parsing bug
6659 fast-import: count --max-pack-size in bytes
6660 Revert 30816237 and 7e62265
6661 Update draft release notes to 1.7.0
6663 Michael J Gruber (1):
6664 git-clean: fix the description of the default behavior
6667 filter-branch: Fix to allow replacing submodules with another content
6668 filter-branch: Add tests for submodules in tree-filter
6670 Michele Ballabio (1):
6671 git-gui: update Italian translation
6673 Nanako Shiraishi (1):
6674 git-gui: update Japanese translation
6677 fix multiple issues with t5300
6678 pack-objects: fix pack generation when using pack_size_limit
6679 make --max-pack-size argument to 'git pack-object' count in bytes
6680 update git-repack documentation wrt repack.UseDeltaBaseOffset
6682 Pal-Kristian Engstad (1):
6683 git-p4: Fix sync errors due to new server version
6686 git-gui: use themed tk widgets with Tk 8.5
6689 gitk: Fix copyright symbol in About box message
6692 git-gui: Update Swedish translation (520t0f0u)
6694 Peter Oberndorfer (1):
6695 git-gui: use different icon for new and modified files in the index
6697 Ralf Wildenhues (1):
6698 Fix typos in technical documentation.
6701 grep: simplify assignment of ->fixed
6702 archive: simplify archive format guessing
6704 Shawn O. Pearce (4):
6705 git-gui: Remove unused icon file_parttick
6706 git-gui: Update translation template
6707 fast-import: Stream very large blobs directly to pack
6708 Correct spelling of 'REUC' extension
6710 Wesley J. Landaker (1):
6711 Update git fsck --full short description to mention packs
6714 Version v1.7.0-rc1; changes since v1.7.0-rc0:
6715 ---------------------------------------------
6717 Alejandro Riveira Fernández (1):
6718 Add test-run-command to .gitignore
6720 Benjamin Kramer (1):
6721 grep: use REG_STARTEND (if available) to speed up regexec
6723 Christian Couder (1):
6724 gitk: Add "--no-replace-objects" option
6726 Christian Stimming (1):
6727 gitk: Update German translation
6730 grep: Fix two memory leaks
6733 gitk: Enable gitk to create tags with messages
6734 gitk: Fix display of newly-created tags
6736 Emmanuel Trillaud (1):
6737 gitk: Add French translation
6739 Fredrik Kuivinen (1):
6743 git-cvsserver: allow regex metacharacters in CVSROOT
6745 Ilari Liusvaara (7):
6746 Support addresses with ':' in git-daemon
6747 Allow use of []-wrapped addresses in git://
6749 Fix integer overflow in patch_delta()
6750 Fix integer overflow in unpack_sha1_rest()
6751 Fix integer overflow in unpack_compressed_entry()
6752 Fix remote.<remote>.vcs
6755 t0101: use absolute date
6756 rerere: fix too-short initialization
6757 test combinations of @{} syntax
6758 fix parsing of @{-1}@{u} combination
6759 reject @{-1} not at beginning of object name
6760 fix memcpy of overlapping area
6761 fix off-by-one allocation error
6762 add shebang line to git-mergetool--lib.sh
6765 git diff: Don't test submodule dirtiness with --ignore-submodules
6766 Teach diff --submodule that modified submodule directory is dirty
6769 builtin-config: Fix crash when using "-f <relative path>" from non-root dir
6772 git_connect: use use_shell instead of explicit "sh", "-c"
6773 Implement pthread_cond_broadcast on Windows
6775 Junio C Hamano (13):
6776 Make ce_uptodate() trustworthy again
6777 grep: expose "status-only" feature via -q
6778 Fix log -g this@{upstream}
6779 approxidate_careful() reports errorneous date string
6780 work around an obnoxious bash "safety feature" on OpenBSD
6781 Update @{bogus.timestamp} fix not to die()
6782 t0101: use a fixed timestamp when searching in the reflog
6783 transport_get(): drop unnecessary check for !remote
6784 tests: update tests that used to fail
6785 grep --quiet: finishing touches
6786 Update draft release notes to 1.7.0
6787 RPM packaging: don't include foreign-scm-helper bits yet
6788 is_submodule_modified(): fix breakage with external GIT_INDEX_FILE
6791 gitk: Display submodule diffs with appropriate encoding
6794 gitk: Add Hungarian translation
6796 Markus Heidelberg (2):
6797 gitk: Adjust two equal strings which differed in whitespace
6798 rebase: don't invoke the pager for each commit summary
6800 Michele Ballabio (1):
6801 gitk: update Italian translation
6804 gitk: Update Hungarian translation
6807 gitk: Update Swedish translation
6810 bash: don't offer remote transport helpers as subcommands
6811 bash: support 'git notes' and its subcommands
6813 Sebastian Schuberth (1):
6814 If deriving SVN_SSH from GIT_SSH on msys, also add quotes
6817 rebase: replace antiquated sed invocation
6818 commit-tree: remove unused #define
6819 tests: consolidate CR removal/addition functions
6820 t0022: replace non-portable literal CR
6821 am: fix patch format detection for Thunderbird "Save As" emails
6822 fix portability issues with $ in double quotes
6825 t5541-http-push: make grep expression check for one line only
6828 Version v1.7.0-rc0; changes since v1.6.6.3:
6829 -------------------------------------------
6831 Andreas Gruenbacher (2):
6832 builtin-apply.c: Skip filenames without enough components
6833 builtin-apply.c: fix the --- and +++ header filename consistency check
6836 git-svn: ignore changeless commits when checking for a cherry-pick
6837 git-svn: handle merge-base failures
6838 git-svn: update svn mergeinfo test suite
6840 Andrzej K. Haczewski (1):
6841 MSVC: Windows-native implementation for subset of Pthreads API
6844 git merge -X<option>
6845 Teach git-pull to pass -X<option> to git-merge
6846 Extend merge-subtree tests to test -Xsubtree=dir.
6848 Bart Trojanowski (1):
6849 hg-to-git: fix COMMITTER type-o
6852 cvsimport: modernize callouts to git subcommands
6853 cvsimport: standarize open() calls to external git tools
6854 cvsimport: standarize system() calls to external git tools
6857 Test update-index for a gitlink to a .git file
6858 Handle relative paths in submodule .git files
6860 Christian Couder (8):
6861 reset: improve mixed reset error message when in a bare repo
6862 Documentation: reset: add some tables to describe the different options
6863 reset: add a few tests for "git reset --merge"
6864 Documentation: reset: add some missing tables
6865 t7111: check that reset options work as described in the tables
6866 help: fix configured help format taking over command line one
6867 t7111: fix bad HEAD in tests with unmerged entries
6868 Documentation: rev-list: fix synopsys for --tags and and --remotes
6870 Daniel Barkalow (9):
6871 Fix memory leak in helper method for disconnect
6872 Allow programs to not depend on remotes having urls
6873 Use a function to determine whether a remote is valid
6874 Allow fetch to modify refs
6875 Add a config option for remotes to specify a foreign vcs
6876 Add support for "import" helper command
6877 Allow helper to map private ref names into normal names
6878 Allow helpers to report in "list" command that the ref is unchanged
6879 Replace parse_blob() with an explanatory comment
6882 t7800-difftool: Set a bogus tool for use by tests
6883 git-difftool: Add '--gui' for selecting a GUI tool
6884 difftool--helper: Update copyright and remove distracting comments
6885 difftool--helper: Remove use of the GIT_MERGE_TOOL variable
6886 difftool: Allow specifying unconfigured commands with --extcmd
6887 git-diff.txt: Link to git-difftool
6888 t7800-difftool.sh: Simplify the --extcmd test
6889 difftool: Add '-x' and as an alias for '--extcmd'
6890 difftool: Use eval to expand '--extcmd' expressions
6891 difftool: Update copyright notices to list each year separately
6892 t7800-difftool.sh: Test mergetool.prompt fallback
6895 daemon: consider only address in kill_some_child()
6896 Windows: disable Python
6898 Felipe Contreras (1):
6899 General --quiet improvements
6902 No diff -b/-w output for all-whitespace changes
6904 Horst H. von Brand (1):
6905 git-rebase.txt: Fix spelling
6908 git-svn: fix mismatched src/dst errors for branch/tag
6909 git-svn: respect commiturl option for branch/tag
6910 git-svn: add --username/commit-url options for branch/tag
6911 git-svn: document --username/commit-url for branch/tag
6913 Ilari Liusvaara (15):
6914 Add remote helper debug mode
6915 Support mandatory capabilities
6916 Pass unknown protocols to external protocol handlers
6917 Refactor git transport options parsing
6918 Support taking over transports
6919 Support remote helpers implementing smart transports
6920 Support remote archive from all smart transports
6921 Remove special casing of http, https and ftp
6922 Reset possible helper before reusing remote structure
6923 Improve error message when a transport helper was not found
6924 Add push --set-upstream
6925 Add git remote set-url
6926 Add branch --set-upstream
6928 rev-parse --branches/--tags/--remotes=pattern
6931 gitweb.js: Workaround for IE8 bug
6933 James P. Howard, II (1):
6934 commit: support commit.status, --status, and --no-status
6937 builtin-push: add --delete as syntactic sugar for :foo
6940 git-svn: allow UUID to be manually remapped via rewriteUUID
6941 git-svn: allow subset of branches/tags to be specified in glob spec
6944 status: typo fix in usage
6945 status: refactor short-mode printing to its own function
6946 status: refactor format option parsing
6947 status: add --porcelain output format
6948 commit: support alternate status formats
6949 docs: note that status configuration affects only long format
6950 tests: rename duplicate t1009
6951 status: disable color for porcelain format
6952 status: reduce duplicated setup code
6953 tests: handle NO_PYTHON setting
6954 run-command: add "use shell" option
6955 run-command: convert simple callsites to use_shell
6956 run-command: optimize out useless shell calls
6957 editor: use run_command's shell feature
6958 textconv: use shell to run helper
6959 diff: run external diff helper with shell
6960 strbuf_expand: convert "%%" to "%"
6961 strbuf: add strbuf_addbuf_percentquote
6962 commit: show interesting ident information in summary
6963 commit: allow suppression of implicit identity advice
6966 Show submodules as modified when they contain a dirty work tree
6967 git status: Show uncommitted submodule changes too when enabled
6968 Performance optimization for detection of modified submodules
6971 diff.c: fix typoes in comments
6974 Basic build infrastructure for Python scripts
6975 fast-import: Proper notes tree manipulation
6976 Rename t9301 to t9350, to make room for more fast-import tests
6977 Add more testcases to test fast-import of notes
6979 Johannes Schindelin (2):
6980 Allow specifying the remote helper in the url
6981 Introduce <branch>@{upstream} notation
6984 Make test case number unique
6985 filter-branch: remove an unnecessary use of 'git read-tree'
6986 t0021: use $SHELL_PATH for the filter script
6987 t4030, t4031: work around bogus MSYS bash path conversion
6988 start_command: report child process setup errors to the parent's stderr
6989 run-command: move wait_or_whine earlier
6990 start_command: detect execvp failures early
6991 Windows: boost startup by avoiding a static dependency on shell32.dll
6992 Windows: simplify the pipe(2) implementation
6993 Windows: avoid the "dup dance" when spawning a child process
6994 Do not use date.c:tm_to_time_t() from compat/mingw.c
6995 Makefile: honor NO_CURL when setting REMOTE_CURL_* variables
6996 Make test case numbers unique
6997 Make 'rerere forget' work from a subdirectory.
6998 merge-tree: remove unnecessary call of git_extract_argv0_path
6999 Make test numbers unique
7001 Jonathan Nieder (15):
7002 Makefile: make ppc/sha1ppc.o depend on GIT-CFLAGS
7003 Makefile: regenerate assembler listings when asked
7004 Makefile: use target-specific variable to pass flags to cc
7005 Makefile: learn to generate listings for targets requiring special flags
7006 Makefile: consolidate .FORCE-* targets
7007 Documentation: git gc packs refs by default now
7008 Documentation: tiny git config manual tweaks
7009 Documentation: merge: move configuration section to end
7010 Documentation: suggest `reset --merge` in How Merge Works section
7011 Documentation: merge: move merge strategy list to end
7012 Documentation: merge: add an overview
7013 Documentation: emphasize when git merge terminates early
7014 Documentation: merge: add a section about fast-forward
7015 Documentation: simplify How Merge Works
7016 Documentation: merge: use MERGE_HEAD to refer to the remote branch
7018 Junio C Hamano (96):
7019 Refuse updating the current branch in a non-bare repository via push
7020 Refuse deleting the current branch via push
7021 diff: change semantics of "ignore whitespace" options
7022 diff: Rename QUIET internal option to QUICK
7023 git stat: the beginning of "status that is not a dry-run of commit"
7024 git stat -s: short status output
7025 git status: not "commit --dry-run" anymore
7026 send-email: make --no-chain-reply-to the default
7027 "checkout A...B" switches to the merge base between A and B
7028 "rebase --onto A...B" replays history on the merge base between A and B
7029 git-merge-file --ours, --theirs
7030 Teach --[no-]rerere-autoupdate option to merge, revert and friends
7031 commit/status: check $GIT_DIR/MERGE_HEAD only once
7032 commit/status: "git add <path>" is not necessarily how to resolve
7033 status/commit: do not suggest "reset HEAD <path>" while merging
7034 builtin-merge.c: use standard active_cache macros
7035 resolve-undo: record resolved conflicts in a new index extension section
7036 resolve-undo: basic tests
7037 resolve-undo: allow plumbing to clear the information
7038 resolve-undo: "checkout -m path" uses resolve-undo information
7039 resolve-undo: teach "update-index --unresolve" to use resolve-undo info
7040 rerere: remove silly 1024-byte line limit
7041 Kick off 1.7.0 cycle
7043 branch -d: base the "already-merged" safety on the branch it merges with
7044 "reset --merge": fix unmerged case
7045 tests: move convenience regexp to match object names to test-lib.sh
7046 more D/F conflict tests
7047 traverse_trees(): handle D/F conflict case sanely
7048 Aggressive three-way merge: fix D/F case
7049 Fix bit assignment for CE_CONFLICTED
7050 .gitattributes: detect 8-space indent in shell scripts
7051 unpack-trees.c: prepare for looking ahead in the index
7052 unpack-trees.c: look ahead in the index
7053 read-tree --debug-unpack
7054 Describe second batch for 1.7.0 in draft release notes
7055 ident.c: remove unused variables
7056 t3001: test ls-files -o ignored/dir
7057 read_directory_recursive(): refactor handling of a single path into a separate function
7058 read_directory(): further split treat_path()
7059 ls-files: fix overeager pathspec optimization
7060 ident.c: check explicit identity for name and email separately
7061 ident.c: treat $EMAIL as giving user.email identity explicitly
7062 rerere: refactor rerere logic to make it independent from I/O
7063 rerere forget path: forget recorded resolution
7064 bisect.c: mark file-local function static
7065 builtin-rev-list.c: mark file-local function static
7066 pretty.c: mark file-local function static
7067 grep: optimize built-in grep by skipping lines that do not hit
7068 http.c: mark file-local functions static
7069 entry.c: mark file-local function static
7070 parse-options.c: mark file-local function static
7071 read-cache.c: mark file-local functions static
7072 remote-curl.c: mark file-local function static
7073 quote.c: mark file-local function static
7074 submodule.c: mark file-local function static
7075 utf8.c: mark file-local function static
7076 mailmap.c: remove unused function
7077 sha1_file.c: remove unused function
7078 strbuf.c: remove unused function
7079 grep: rip out support for external grep
7080 grep: rip out pessimization to use fixmatch()
7081 t7502: test commit.status, --status and --no-status
7082 strbuf_addbuf(): allow passing the same buf to dst and src
7083 grep: prepare to run outside of a work tree
7084 grep --no-index: allow use of "git grep" outside a git repository
7085 Teach diff that modified submodule directory is dirty
7086 git_attr(): fix function signature
7087 xdl_merge(): introduce xmparam_t for merge specific parameters
7088 xdl_merge(): allow passing down marker_size in xmparam_t
7089 merge-tree: use ll_merge() not xdl_merge()
7090 rerere: use ll_merge() instead of using xdl_merge()
7091 conflict-marker-size: new attribute
7092 commit.c::print_summary: do not release the format string too early
7093 rerere: prepare for customizable conflict marker length
7094 rerere: honor conflict-marker-size attribute
7095 user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
7096 user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
7097 Update COPYING with GPLv2 with new FSF address
7098 Update draft release notes to 1.7.0
7099 pull: Fix parsing of -X<option>
7100 Make "subtree" part more orthogonal to the rest of merge-recursive.
7101 Document that merge strategies can now take their own options
7102 object.c: remove unused functions
7103 symlinks.c: remove unused functions
7104 Update draft release notes to 1.7.0
7105 Fix "checkout A..." synonym for "checkout A...HEAD" on Windows
7106 t1506: more test for @{upstream} syntax
7107 Teach @{upstream} syntax to strbuf_branchanme()
7108 date.c: mark file-local function static
7109 Update draft release notes to 1.7.0
7110 conflict-marker-size: add test and docs
7111 git-mv: fix moving more than one source to a single destination
7112 Update draft release notes to 1.7.0
7113 rebase -i: Export GIT_AUTHOR_* variables explicitly
7114 pull: re-fix command line generation
7116 Linus Torvalds (11):
7117 Remove diff machinery dependency from read-cache
7118 slim down "git show-index"
7119 make "git merge-tree" a built-in
7120 make "git hash-object" a built-in
7121 make "git var" a built-in
7122 make "git patch-id" a built-in
7123 make "merge-index" a built-in
7124 make "mktag" a built-in
7125 make "git unpack-file" a built-in
7126 make "git pack-redundant" a built-in
7127 make "index-pack" a built-in
7130 Add an option for using any HTTP authentication scheme, not only basic
7131 Allow curl to rewind the RPC read buffer
7133 Matthew Ogilvie (3):
7134 build dashless "bin-wrappers" directory similar to installed bindir
7135 run test suite without dashed git-commands in PATH
7136 INSTALL: document a simpler way to run uninstalled builds
7139 Detailed diagnosis when parsing an object name fails.
7140 builtin-config: add --path option doing ~ and ~user expansion.
7141 push: spell 'Note about fast-forwards' section name correctly in error message.
7142 Be more user-friendly when refusing to do something because of conflict.
7143 lockfile: show absolute filename in unable_to_lock_message
7144 branch: warn and refuse to set a branch as a tracking branch of itself.
7146 Michael Haggerty (25):
7147 t3404: Use test_commit to set up test repository
7148 Add a command "fixup" to rebase --interactive
7149 lib-rebase: Provide clearer debugging info about what the editor did
7150 lib-rebase: Allow comments and blank lines to be added to the rebase script
7151 rebase-i: Ignore comments and blank lines in peek_next_command
7152 rebase -i: Make the condition for an "if" more transparent
7153 rebase -i: Remove dead code
7154 rebase -i: Inline expression
7155 rebase -i: Use "test -n" instead of "test ! -z"
7156 rebase -i: Use symbolic constant $MSG consistently
7157 rebase -i: Document how temporary files are used
7158 rebase -i: Introduce a constant AUTHOR_SCRIPT
7159 rebase -i: Introduce a constant AMEND
7160 t3404: Test the commit count in commit messages generated by "rebase -i"
7161 rebase -i: Improve consistency of commit count in generated commit messages
7162 rebase -i: Simplify commit counting for generated commit messages
7163 rebase -i: Extract a function "commit_message"
7164 rebase -i: Handle the author script all in one place in do_next
7165 rebase -i: Extract function do_with_author
7166 rebase -i: Change function make_squash_message into update_squash_message
7167 rebase -i: For fixup commands without squashes, do not start editor
7168 t3404: Set up more of the test repo in the "setup" step
7169 rebase -i: Retain user-edited commit messages after squash/fixup conflicts
7170 rebase -i: Avoid non-portable "test X -a Y"
7171 rebase -i: Enclose sed command substitution in quotes
7173 Michael J Gruber (7):
7174 status -s: respect the status.relativePaths option
7175 t7508-status.sh: Add tests for status -s
7176 builtin-commit: refactor short-status code into wt-status.c
7177 status -s: obey color.status
7178 t7508-status: status --porcelain ignores relative paths setting
7179 t7508-status: test all modes with color
7180 tag -d: print sha1 of deleted tag
7182 Michael Lukashov (1):
7183 Windows: Remove dependency on pthreadGC2.dll
7186 builtin-commit: add --date option
7187 Document date formats accepted by parse_date()
7189 Nanako Shiraishi (3):
7190 rebase -i --autosquash: auto-squash commits
7191 rebase: fix --onto A...B parsing and add tests
7192 rebase -i: teach --onto A...B syntax
7194 Nguyễn Thái Ngọc Duy (27):
7195 update-index: refactor mark_valid() in preparation for new options
7196 Add test-index-version
7197 Introduce "skip-worktree" bit in index, teach Git to get/set this bit
7198 Teach Git to respect skip-worktree bit (reading part)
7199 Teach Git to respect skip-worktree bit (writing part)
7200 Avoid writing to buffer in add_excludes_from_file_1()
7201 Read .gitignore from index if it is skip-worktree
7202 unpack-trees(): carry skip-worktree bit over in merged_entry()
7203 excluded_1(): support exclude files in index
7204 dir.c: export excluded_1() and add_excludes_from_file_1()
7205 Introduce "sparse checkout"
7206 unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
7207 unpack-trees.c: generalize verify_* functions
7208 unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
7209 unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
7210 unpack-trees(): ignore worktree check outside checkout area
7211 read-tree: add --no-sparse-checkout to disable sparse checkout support
7212 Add tests for sparse checkout
7213 sparse checkout: inhibit empty worktree
7214 ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
7215 commit: correctly respect skip-worktree bit
7216 grep: do not do external grep on skip-worktree entries
7217 t7002: set test prerequisite "external-grep" if supported
7218 t7002: test for not using external grep on skip-worktree paths
7219 status: only touch path we may need to check
7220 rm: only refresh entries that we may touch
7221 Fix memory corruption when .gitignore does not end by \n
7224 fix git-p4 editor invocation
7226 Peter Collingbourne (1):
7227 Remove empty directories when checking out a commit with fewer submodules
7230 CVS Server: Support reading base and roots from environment
7232 Ramkumar Ramachandra (1):
7233 Documentation: Update git core tutorial clarifying reference to scripts
7235 Ramsay Allan Jones (5):
7236 MSVC: Fix an "incompatible pointer types" compiler warning
7237 engine.pl: Fix a recent breakage of the buildsystem generator
7238 msvc: Fix an "unrecognized option" linker warning
7239 msvc: Fix a compiler warning due to an incorrect pointer cast
7240 msvc: Add a definition of NORETURN compatible with msvc compiler
7243 Add completion for git-svn mkdirs,reset,and gc
7245 Sebastian Schuberth (1):
7246 Make difftool.prompt fall back to mergetool.prompt
7249 cvsserver: make the output of 'update' more compatible with cvs.
7251 Shawn O. Pearce (1):
7252 bash completion: add space between branch name and status flags
7255 reset: use "unpack_trees()" directly instead of "git read-tree"
7258 Add 'git rev-parse --show-toplevel' option.
7259 Use $(git rev-parse --show-toplevel) in cd_to_toplevel().
7261 Sverre Rabbelier (9):
7262 Fix various memory leaks in transport-helper.c
7263 Add Python support library for remote helpers
7264 fast-import: put option parsing code in separate functions
7265 fast-import: put marks reading in its own function
7266 fast-import: add feature command
7267 fast-import: add option command
7268 fast-import: test the new option command
7269 fast-import: allow for multiple --import-marks= arguments
7270 fast-import: add (non-)relative-marks feature
7272 Tarmigan Casebolt (7):
7273 t/lib-http.sh: Restructure finding of default httpd location
7274 Smart-http: check if repository is OK to export before serving it
7275 Smart-http tests: Improve coverage in test t5560
7276 Smart-http tests: Break test t5560-http-backend into pieces
7277 Smart-http tests: Test http-backend without curl or a webserver
7278 Test t5560: Fix test when run with dash
7279 ident.c: replace fprintf with fputs to suppress compiler warning
7282 http: maintain curl sessions
7283 builtin-push: don't access freed transport->url
7284 check stderr with isatty() instead of stdout when deciding to show progress
7285 git-clone.txt: reword description of progress behaviour
7286 clone: set transport->verbose when -v/--verbose is used
7287 clone: use --progress to force progress reporting
7288 t5541-http-push.sh: add tests for non-fast-forward pushes
7289 t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
7290 refactor ref status logic for pushing
7291 transport.c::transport_push(): make ref status affect return value
7292 transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
7293 transport-helper.c::push_refs(): emit "no refs" error message
7296 Use warning function instead of fprintf(stderr, "Warning: ...").
7297 string-list: rename the include guard to STRING_LIST_H
7300 Documentation/git-merge: reword references to "remote" and "pull"
7301 Documentation: warn prominently against merging with dirty trees
7302 Documentation: format full commands in typewriter font
7303 Documentation: spell 'git cmd' without dash throughout
7304 Documentation: show-files is now called git-ls-files
7305 Documentation: emphasise 'git shortlog' in its synopsis
7306 Documentation: improve description of --glob=pattern and friends
7307 Documentation: add missing :: in config.txt
7308 Documentation: move away misplaced 'push --upstream' description
7311 Version v1.6.6.3; changes since v1.6.6.2:
7312 -----------------------------------------
7314 Christian Couder (1):
7315 bisect: error out when passing bad path parameters
7318 run-command: support custom fd-set in async
7321 require_work_tree broken with NONGIT_OK
7324 Check size of path buffer before writing into it
7327 git-imap-send: Convert LF to CRLF before storing patch to draft box
7330 filter-branch: Fix error message for --prune-empty --commit-filter
7333 gitweb: Introduce esc_attr to escape attributes of HTML elements
7336 dwim_ref: fix dangling symref warning
7337 rm: fix bug in recursive subdirectory removal
7340 t3301-notes: insert a shbang line in ./fake_editor.sh
7341 MSVC: Fix build by adding missing termios.h dummy
7344 t6000lib: Fix permission
7345 lib-patch-mode.sh: Fix permission
7346 Re-fix check-ref-format documentation mark-up
7347 Fix typo in 1.6.6.2 release notes
7351 diff: make sure --output=/bad/path is caught
7353 Michael J Gruber (4):
7354 Documentation/git-reflog: Fix formatting of command lists
7355 Documentation/gitdiffcore: Remove misleading date in heading
7356 Documentation/urls: Remove spurious example markers
7357 Documentation/git-clone: Transform description list into item list
7360 Remove extra '-' from git-am(1)
7363 Remove hyphen from "git-command" in two error messages
7366 fix minor memory leak in get_tree_entry()
7367 utf8.c: remove print_wrapped_text()
7368 utf8.c: remove print_spaces()
7369 utf8.c: remove strbuf_write()
7370 utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
7372 Shawn O. Pearce (7):
7373 run-command: Allow stderr to be a caller supplied pipe
7374 send-pack: demultiplex a sideband stream with status data
7375 receive-pack: Refactor how capabilities are shown to the client
7376 receive-pack: Wrap status reports inside side-band-64k
7377 receive-pack: Send hook output over side band #2
7378 t5401: Use a bare repository for the remote peer
7379 receive-pack: Send internal errors over side-band #2
7382 request-pull.txt: Document -p option
7385 stash pop: remove 'apply' options during 'drop' invocation
7386 cherry_pick_list: quit early if one side is empty
7388 Uwe Kleine-König (1):
7389 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
7392 Version v1.6.6.2; changes since v1.6.6.1:
7393 -----------------------------------------
7395 Christopher Beelby (1):
7396 git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync
7399 git-cvsserver: allow regex metacharacters in CVSROOT
7401 Giuseppe Bilotta (1):
7402 git-gui: work from the .git dir
7404 Ilari Liusvaara (4):
7406 Fix integer overflow in patch_delta()
7407 Fix integer overflow in unpack_sha1_rest()
7408 Fix integer overflow in unpack_compressed_entry()
7411 blame: prevent a segv when -L given start > EOF
7414 git-gui: Fix applying a line when all following lines are deletions
7417 fix memcpy of overlapping area
7420 git-gui: Correct file_states when unstaging partly staged entry
7423 builtin-config: Fix crash when using "-f <relative path>" from non-root dir
7425 Jonathan Nieder (1):
7426 git-gui: Makefile: consolidate .FORCE-* targets
7428 Junio C Hamano (15):
7429 checkout -m path: fix recreating conflicts
7430 status: don't require the repository to be writable
7431 Fix "log" family not to be too agressive about showing notes
7432 Fix "log --oneline" not to show notes
7433 merge-recursive: do not return NULL only to cause segfault
7434 ignore duplicated slashes in make_relative_path()
7435 approxidate_careful() reports errorneous date string
7436 Update @{bogus.timestamp} fix not to die()
7437 t0101: use a fixed timestamp when searching in the reflog
7438 git-add documentation: Fix shell quoting example
7439 Fix parsing of imap.preformattedHTML and imap.sslverify
7440 git-push: document all the status flags used in the output
7441 check-ref-format documentation: fix enumeration mark-up
7442 t8003: check exit code of command and error message separately
7445 Nguyễn Thái Ngọc Duy (1):
7446 Add missing #include to support TIOCGWINSZ on Solaris
7449 git-gui: handle really long error messages in updateindex.
7452 git-gui: Fix gitk for branch whose name matches local file
7455 archive: complain about path specs that don't match anything
7456 archive: simplify archive format guessing
7459 bash: don't offer remote transport helpers as subcommands
7461 Shawn O. Pearce (1):
7462 fast-import: Stream very large blobs directly to pack
7465 retry request without query when info/refs?query fails
7467 Vitaly "_Vi" Shukela (1):
7468 git-gui: Add hotkeys for "Unstage from commit" and "Revert changes"
7470 Wesley J. Landaker (1):
7471 Update git fsck --full short description to mention packs
7474 Version v1.6.6.1; changes since v1.6.6:
7475 ---------------------------------------
7477 Andreas Gruenbacher (3):
7478 base85 debug code: Fix length byte calculation
7479 base85: encode_85() does not use the decode table
7480 base85: Make the code more obvious instead of explaining the non-obvious
7483 git count-objects: handle packs bigger than 4G
7485 Björn Gustavsson (4):
7486 Documentation: 'git add -A' can remove files
7487 git-add/rm doc: Consistently back-quote
7488 Fix "git remote update" with remotes.defalt set
7489 git-rm doc: Describe how to sync index & work tree
7492 bisect: fix singular/plural grammar nit
7495 fast-import: tag may point to any object type
7498 commit: --cleanup is a message option
7501 reset: unbreak hard resets with GIT_WORK_TREE
7502 textconv: stop leaking file descriptors
7505 grep: NUL terminate input from a file
7507 Jonathan Nieder (2):
7508 Documentation: git gc packs refs by default now
7509 Documentation: tiny git config manual tweaks
7511 Junio C Hamano (10):
7512 t1200: work around a bug in some implementations of "find"
7513 t4019 "grep" portability fix
7514 Start 1.6.6.X maintenance track
7515 Makefile: FreeBSD (both 7 and 8) needs OLD_ICONV
7516 checkout -m: do not try to fall back to --merge from an unborn branch
7517 grep: -L should show empty files
7518 Update draft release notes to 1.6.6.1
7519 Fix mis-backport of t7002
7524 SubmittingPatches: hints to know the status of a submitted patch.
7525 branch: die explicitly why when calling "git branch [-a|-r] branchname".
7526 stash: mention --patch in usage string.
7528 Michael Haggerty (1):
7529 rebase--interactive: Ignore comments and blank lines in peek_next_command
7531 Nathaniel W Filardo (1):
7532 read_index(): fix reading extension size on BE 64-bit archs
7534 Nguyễn Thái Ngọc Duy (2):
7535 Documentation: always respect core.worktree if set
7536 t7102: make the test fail if one of its check fails
7538 Ramkumar Ramachandra (1):
7539 Document git-blame triple -C option
7541 Richard Weinberger (1):
7542 Fix uninitialized variable in get_refs_via_rsync().
7544 Shawn O. Pearce (2):
7545 fast-import: Document author/committer/tagger name is optional
7546 remote-curl: Fix Accept header for smart HTTP connections
7549 octopus: make merge process simpler to follow
7550 octopus: reenable fast-forward merges
7551 octopus: remove dead code
7553 Tarmigan Casebolt (1):
7554 Add git-http-backend to command-list.
7557 bash completion: factor submodules into dirty state
7560 Version v1.6.6; changes since v1.6.6-rc4:
7561 -----------------------------------------
7564 git-svn: Remove obsolete MAXPARENT check
7567 Prevent git blame from segfaulting on a missing author name
7570 git svn: fix --revision when fetching deleted paths
7571 update release notes for git svn in 1.6.6
7572 git svn: lookup new parents correctly from svn:mergeinfo
7573 git svn: branch/tag commands detect username in URLs
7579 git svn: add test for a git svn gc followed by a git svn mkdirs
7582 git-svn: expand the svn mergeinfo test suite, highlighting some failures
7583 git-svn: memoize conversion of SVN merge ticket info to git commit ranges
7584 git-svn: fix some mistakes with interpreting SVN mergeinfo commit ranges
7585 git-svn: exclude already merged tips using one rev-list call
7586 git-svn: detect cherry-picks correctly.
7589 Version v1.6.6-rc4; changes since v1.6.6-rc3:
7590 ---------------------------------------------
7592 Björn Gustavsson (1):
7593 rebase -i: abort cleanly if the editor fails to launch
7596 git svn: make empty directory creation gc-aware
7597 t9146: use 'svn_cmd' wrapper
7603 api-strbuf.txt: fix typos and document launch_editor()
7604 technical-docs: document hash API
7607 Version v1.6.6-rc3; changes since v1.6.6-rc2:
7608 ---------------------------------------------
7610 Björn Gustavsson (1):
7611 bash: Support new 'git fetch' options
7614 ignore unknown color configuration
7617 help.autocorrect: do not run a command if the command given is junk
7620 Remove post-upload-hook
7621 Fix archive format with -- on the command line
7623 Update Release Notes for 1.6.6 to remove old bugfixes
7624 worktree: don't segfault with an absolute pathspec without a work tree
7628 Nanako Shiraishi (1):
7629 Illustrate "filter" attribute with an example
7632 Version v1.6.6-rc2; changes since v1.6.6-rc1:
7633 ---------------------------------------------
7636 git-svn: sort svk merge tickets to account for minimal parents
7637 git-svn: Set svn.authorsfile to an absolute path when cloning
7638 git-svn: set svn.authorsfile earlier when cloning
7640 Alexander Gavrilov (1):
7641 git-gui: Increase blame viewer usability on MacOS.
7644 gitk: Skip translation of "wrong Tcl version" message
7647 t4201: use ISO8859-1 rather than ISO-8859-1
7648 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
7650 Clemens Buchacher (1):
7651 git-gui: search 4 directories to improve statistic of gc hint
7654 git svn: log removals of empty directories
7657 git svn: Don't create empty directories whose parents were deleted
7659 Guillermo S. Romero (1):
7660 gitk: Add configuration for UI colour scheme
7663 git gui: make current branch default in "remote delete branch" merge check
7666 gitweb: Describe (possible) gitweb.js minification in gitweb/README
7669 pull: clarify advice for the unconfigured error case
7672 rerere: don't segfault on failure to open rr-cache
7673 reset: improve worktree safety valves
7674 add-interactive: fix deletion of non-empty files
7677 gitk: Fix diffing committed -> staged (typo in diffcmd)
7678 gitk: Use the --submodule option for displaying diffs when available
7680 Jindrich Makovicka (1):
7681 git-gui: suppress RenderBadPicture X error caused by Tk bug
7684 Fix crasher on encountering SHA1-like non-note in notes tree
7687 Documentation/Makefile: allow man.base.url.for.relative.link to be set from Make
7688 Unconditionally set man.base.url.for.relative.links
7690 Documentation: xmlto 0.0.18 does not know --stringparam
7693 Revert recent "git merge <msg> HEAD <commit>..." deprecation
7694 Update draft release notes to 1.6.6 before -rc2
7698 Fix diff -B/--dirstat miscounting of newly added contents
7700 Markus Heidelberg (1):
7701 gitk: Fix "git gui blame" invocation when called from top-level directory
7704 gitk: Add Japanese translation
7705 gitk: Update Japanese translation
7708 gitk: Use themed tk widgets
7709 gitk: Fix errors in the theme patch
7710 gitk: Default to the system colours on Windows
7711 gitk: Fix selection of tags
7714 gitk: Restore scrolling position of diff pane on back/forward in history
7715 gitk: Add a user preference to enable/disable use of themed widgets
7716 gitk: Show diff of commits at end of compare-commits output
7717 gitk: Don't compare fake children when comparing commits
7718 gitk: Improve appearance of radiobuttons and checkbuttons
7721 archive: clarify description of path parameter
7724 bash: update 'git commit' completion
7726 Sitaram Chamarty (1):
7727 gitk: Disable checkout of remote branches
7730 Documentation: Avoid use of xmlto --stringparam
7733 Version v1.6.6-rc1; changes since v1.6.6-rc0:
7734 ---------------------------------------------
7737 builtin-merge.c: call exclude_cmds() correctly.
7739 Benjamin Kramer (1):
7740 Explicitly truncate bswap operand to uint32_t
7743 Give the hunk comment its own color
7744 get_ref_states: strdup entries and free util in stale list
7746 Björn Gustavsson (11):
7747 Teach the --all option to 'git fetch'
7748 Teach the --multiple option to 'git fetch'
7749 Add the configuration option skipFetchAll
7750 Add missing test for 'git remote update --prune'
7751 Re-implement 'git remote update' using 'git fetch'
7752 Clarify and correct -z
7753 apply: apply works outside a repository
7754 apply: Format all options using back-quotes
7755 apply: Use the term "working tree" consistently
7756 Fix over-simplified documentation for 'git log -z'
7757 gitworkflows: Consistently back-quote git commands
7759 Brian Gernhardt (1):
7760 t/gitweb-lib: Split HTTP response with non-GNU sed
7762 Christian Couder (6):
7763 Documentation: add "Fighting regressions with git bisect" article
7764 replace: use a GIT_NO_REPLACE_OBJECTS env variable
7765 Documentation: fix typos and spelling in replace documentation
7766 Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
7767 bisect: simplify calling visualizer using '--bisect' option
7768 Documentation: update descriptions of revision options related to '--bisect'
7771 help: Do not unnecessarily look for a repository
7773 David Soria Parra (1):
7774 Documentation: Document --branch option in git clone synopsis
7777 commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
7779 Felipe Contreras (3):
7780 format-patch: fix parsing of "--" on the command line
7781 format-patch: add test for parsing of "--"
7782 send-email: automatic envelope sender
7784 Horst H. von Brand (1):
7785 git-pull.sh: Fix call to git-merge for new command format
7787 Jakub Narebski (10):
7788 gitweb: Add optional "time to generate page" info in footer
7789 gitweb: Incremental blame (using JavaScript)
7790 gitweb: Colorize 'blame_incremental' view during processing
7791 gitweb: Create links leading to 'blame_incremental' using JavaScript
7792 gitweb: Minify gitweb.js if JSMIN is defined
7793 t/gitweb-lib.sh: Split gitweb output into headers and body
7794 gitweb: Document current snapshot rules via new tests
7795 gitweb.js: Harden setting blamed commit info in incremental blame
7796 gitweb: Make linking to actions requiring JavaScript a feature
7797 gitweb: Add link to other blame implementation in blame views
7800 remote: refactor some logic into get_stale_heads()
7801 teach warn_dangling_symref to take a FILE argument
7802 builtin-fetch: add --prune option
7803 builtin-fetch: add --dry-run option
7806 prune-packed: only show progress when stderr is a tty
7809 t4014-format-patch: do not assume 'test' is available as non-builtin
7810 Add a notice that only certain functions can print color escape codes
7812 Jonathan Nieder (1):
7813 Makefile: do not clean arm directory
7815 Junio C Hamano (19):
7816 mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
7817 Pretty-format: %[+-]x to tweak inter-item newlines
7818 read_revision_from_stdin(): use strbuf
7819 Teach --stdin option to "log" family
7820 setup_revisions(): do not call get_pathspec() too early
7821 Make --stdin option to "log" family read also pathspecs
7822 t9001: test --envelope-sender option of send-email
7823 Add trivial tests for --stdin option to log family
7824 Protect scripted Porcelains from GREP_OPTIONS insanity
7825 builtin-apply.c: pay attention to -p<n> when determining the name
7826 Remove dead code from "git am"
7827 emit_line(): don't emit an empty <SET><RESET> followed by a newline
7828 Update draft release notes to 1.6.6 before merging topics for -rc1
7829 git-merge: a deprecation notice of the ancient command line syntax
7830 Update draft release notes to 1.6.6 before -rc1
7831 Do not misidentify "git merge foo HEAD" as an old-style invocation
7832 merge: do not add standard message when message is given with -m option
7837 gitweb: check given hash before trying to create snapshot
7838 gitweb: Smarter snapshot names
7841 Disable CURLOPT_NOBODY before enabling CURLOPT_PUT and CURLOPT_POST
7842 Refactor winsock initialization into a separate function
7843 Enable support for IPv6 on MinGW
7845 Matthew Ogilvie (5):
7846 cvsserver doc: database generally can not be reproduced consistently
7847 config documentation: some configs are auto-set by git-init
7848 t2300: use documented technique to invoke git-sh-setup
7849 t3409 t4107 t7406 t9150: use dashless commands
7850 t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATH
7853 merge-recursive: point the user to commit when file would be overwritten.
7854 user-manual: Document that "git merge" doesn't like uncommited changes.
7855 merge-recursive: make the error-message generation an extern function
7856 builtin-merge: show user-friendly error messages for fast-forward too.
7858 Michael J Gruber (1):
7859 Documentation: Fix a few i.e./e.g. mix-ups
7861 Nanako Shiraishi (2):
7862 t1200: fix a timing dependent error
7863 prepare send-email for smoother change of --chain-reply-to default
7866 pack-objects: split implications of --all-progress from progress activation
7868 Ramsay Allan Jones (1):
7869 git-count-objects: Fix a disk-space under-estimate on Cygwin
7872 strbuf_add_wrapped_text(): skip over colour codes
7873 mergetool--lib: simplify guess_merge_tool()
7876 gitweb.js: fix null object exception in initials calculation
7877 instaweb: restart server if already running
7878 gitweb.js: fix padLeftStr() and its usage
7881 remote-curl.c: fix rpc_out()
7883 Uwe Kleine-König (1):
7884 shortlog: respect commit encoding
7887 Version v1.6.6-rc0; changes since v1.6.5.9:
7888 -------------------------------------------
7891 git-gui: Update russian translation
7893 Alexey Borzenkov (1):
7894 git-gui: store wm state and fix wm geometry
7897 bisect reset: Allow resetting to any commit, not just a branch
7900 configure: add macro to set arbitrary make variables
7901 configure: add settings for gitconfig, editor and pager
7903 Björn Gustavsson (10):
7904 Teach 'rebase -i' the command "reword"
7905 bash: complete more options for 'git rebase'
7906 Teach 'git merge' and 'git pull' the option --ff-only
7907 format-patch: Always generate a patch
7908 format-patch documentation: Remove diff options that are not useful
7909 format-patch documentation: Fix formatting
7910 format-patch: Add "--no-stat" as a synonym for "-p"
7911 bash: add the merge option --ff-only
7912 Fix truncated usage messages
7913 User Manual: Write "Git" instead of "GIT"
7915 Christian Couder (1):
7916 git: add --no-replace-objects option to disable replacing
7918 Clemens Buchacher (2):
7919 remote-helpers: return successfully if everything up-to-date
7920 set httpd port before sourcing lib-httpd
7923 git-gui: Limit display to a maximum number of files
7926 submodule.c: Squelch a "use before assignment" warning
7929 commit: More generous accepting of RFC-2822 footer lines.
7932 git-blame.el: Change how blame information is shown.
7935 git svn: fix fetch where glob is on the top-level URL
7936 git svn: read global+system config for clone+init
7937 git svn: add authorsfile test case for ~/.gitconfig
7938 git svn: attempt to create empty dirs on clone+rebase
7939 git svn: always reuse existing remotes on fetch
7940 git svn: strip leading path when making empty dirs
7943 imap-send: use separate read and write fds
7944 imap-send: use run-command API for tunneling
7945 imap-send: fix compilation-error on Windows
7946 imap-send: build imap-send on Windows
7947 mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
7948 mingw: enable OpenSSL
7950 Felipe Contreras (2):
7952 Use 'fast-forward' all over the place
7955 git-gui: remove warning when deleting correctly merged remote branch
7957 Ingmar Vanhassel (1):
7958 import-tars: Add support for tarballs compressed with lzma, xz
7961 gitweb: Add 'show-sizes' feature to show blob sizes in tree view
7962 gitweb: Refactor 'log' action generation, adding git_log_body()
7963 gitweb: Refactor common parts of 'log' and 'shortlog' views
7964 gitweb: Make 'history' view (re)use git_log_generic()
7967 Teach "git describe" --dirty option
7970 imap-send: remove useless uid code
7971 gitignore: root most patterns at the top-level directory
7972 t915{0,1}: use $TEST_DIRECTORY
7975 git-gui: display summary when showing diff of a submodule
7976 git-gui: fix diff for partially staged submodule changes
7977 git submodule add: make the <path> parameter optional
7978 git-gui: fix use of uninitialized variable
7979 add tests for git diff --submodule
7981 Jimmy Angelakos (1):
7982 git-gui: Added Greek translation & glossary
7985 Teach "-m <msg>" and "-F <file>" to "git notes edit"
7986 fast-import: Add support for importing commit notes
7987 t3302-notes-index-expensive: Speed up create_repo()
7988 Add flags to get_commit_notes() to control the format of the note string
7989 Teach notes code to free its internal data structures on request
7990 Teach the notes lookup code to parse notes trees with various fanout schemes
7991 Add selftests verifying that we can parse notes trees with various fanouts
7992 Refactor notes code to concatenate multiple notes annotating the same object
7993 Add selftests verifying concatenation of multiple notes for the same commit
7995 Johannes Schindelin (8):
7996 print_wrapped_text(): allow hard newlines
7997 Add strbuf_add_wrapped_text() to utf8.[ch]
7998 Introduce commit notes
7999 Add a script to edit/inspect notes
8000 Speed up git notes lookup
8001 Add an expensive test for git-notes
8002 Add '%N'-format for pretty-printing commit notes
8003 Add the --submodule option to the diff option family
8006 Windows: use BLK_SHA1 again
8008 Jonathan Nieder (34):
8009 Add tests for git check-ref-format
8010 check-ref-format: simplify --print implementation
8011 Handle more shell metacharacters in editor names
8012 Retire fetch--tool helper to contrib/examples
8013 Show usage string for 'git grep -h'
8014 Show usage string for 'git cherry -h'
8015 Show usage string for 'git commit-tree -h'
8016 Show usage string for 'git merge-ours -h'
8017 Show usage string for 'git show-ref -h'
8018 http-fetch: add missing initialization of argv0_path
8019 Show usage string for 'git check-ref-format -h'
8020 Show usage string for 'git fast-import -h'
8021 Show usage string for 'git get-tar-commit-id -h'
8022 Show usage string for 'git imap-send -h'
8023 Show usage string for 'git mailsplit -h'
8024 Show usage string for 'git merge-one-file -h'
8025 Show usage string for 'git rev-parse -h'
8026 Show usage string for 'git show-index -h'
8027 Show usage string for 'git unpack-file -h'
8028 Show usage string for 'git stripspace -h'
8029 Let 'git http-fetch -h' show usage outside any git repository
8030 Show usage string for 'git http-push -h'
8031 Let 'git <command> -h' show usage without a git dir
8032 Introduce usagef() that takes a printf-style format
8033 merge-{recursive,subtree}: use usagef() to print usage
8034 diff --no-index: make the usage string less scary
8035 Do not use VISUAL editor on dumb terminals
8036 Suppress warnings from "git var -l"
8037 Teach git var about GIT_EDITOR
8038 Teach git var about GIT_PAGER
8039 add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
8040 am -i, git-svn: use "git var GIT_PAGER"
8041 Provide a build time default-editor setting
8042 Speed up bash completion loading
8044 Julian Phillips (4):
8045 fetch: Speed up fetch by rewriting find_non_local_tags
8046 remote: Make ref_remove_duplicates faster for large numbers of refs
8047 fetch: Speed up fetch of large numbers of refs
8048 remote: fix use-after-free error detected by glibc in ref_remove_duplicates
8050 Junio C Hamano (20):
8051 diff-lib.c: fix misleading comments on oneway_diff()
8052 unpack-trees: typofix
8053 unpack_callback(): use unpack_failed() consistently
8054 git check-ref-format --print
8056 check_filename(): make verify_filename() callable without dying
8057 DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
8058 format_commit_message(): fix function signature
8059 fsck: default to "git fsck --full"
8060 git checkout --no-guess
8061 Teach --wrap to only indent without wrapping
8062 Update draft release notes to 1.6.6
8063 Revert "Don't create the $GIT_DIR/branches directory on init"
8064 t1200: further modernize test script style
8065 t1200: prepare for merging with Fast-forward bikeshedding
8066 builtin-commit.c: fix logic to omit empty line before existing footers
8067 git-describe.txt: formatting fix
8068 Provide a build time default-pager setting
8069 Update draft release notes to 1.6.6
8073 Add '--bisect' revision machinery argument
8075 Marius Storm-Olsen (1):
8076 MSVC: Enable OpenSSL, and translate -lcrypto
8079 http-backend: add GIT_PROJECT_ROOT environment var
8080 http-backend: reword some documentation
8081 http-backend: use mod_alias instead of mod_rewrite
8082 http-backend: add example for gitweb on same URL
8083 http-backend: more explict LocationMatch
8086 instaweb: support mod_cgid for apache2
8088 Markus Heidelberg (1):
8089 bash completion: difftool accepts the same options as diff
8091 Michael J Gruber (1):
8092 Make t9150 and t9151 test scripts executable
8095 pack-objects: move thread autodetection closer to relevant code
8097 Ramsay Allan Jones (2):
8098 Makefile: keep MSVC and Cygwin configuration separate
8099 MSVC: Add support for building with NO_MMAP
8102 describe: load refnames before calling describe()
8103 Implement wrap format %w() as if it is a mode switch
8104 log --format: don't ignore %w() at the start of format string
8105 grep: unset GREP_OPTIONS before spawning external grep
8106 strbuf_add_wrapped_text(): factor out strbuf_add_indented_text()
8107 log --format: document %w
8109 Robin Rosenberg (1):
8110 Don't create the $GIT_DIR/branches directory on init
8113 Documentation: add 'git replace' to main git manpage
8116 git-svn: add test data for SVK merge, with script.
8117 git-svn: allow test setup script to support PERL env. var
8118 git-svn: convert SVK merge tickets to extra parents
8119 git-svn: add test data for SVN 1.5+ merge, with script.
8120 git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents
8123 mergetool--lib: add p4merge as a pre-configured mergetool option
8124 Update packfile transfer protocol documentation
8126 Sebastian Schuberth (2):
8127 Use faster byte swapping when compiling with MSVC
8128 Make the MSVC projects use PDB/IDB files named after the project
8130 Shawn O. Pearce (27):
8131 git-gui: Ensure submodule path is quoted properly
8132 pkt-line: Add strbuf based functions
8133 pkt-line: Make packet_read_line easier to debug
8134 fetch-pack: Use a strbuf to compose the want list
8135 Move "get_ack()" back to fetch-pack
8136 Add multi_ack_detailed capability to fetch-pack/upload-pack
8137 remote-curl: Refactor walker initialization
8138 fetch: Allow transport -v -v -v to set verbosity to 3
8139 remote-helpers: Fetch more than one ref in a batch
8140 remote-helpers: Support custom transport options
8141 Move WebDAV HTTP push under remote-curl
8142 Git-aware CGI to provide dumb HTTP transport
8143 Add stateless RPC options to upload-pack, receive-pack
8144 Smart fetch and push over HTTP: server side
8145 Discover refs via smart HTTP server when available
8146 Smart push over HTTP: client side
8147 Smart fetch over HTTP: client side
8148 Smart HTTP fetch: gzip requests
8149 http tests: use /dumb/ URL prefix
8150 test smart http fetch and push
8151 http-backend: Use http.getanyfile to disable dumb HTTP serving
8152 http-backend: Test configuration options
8153 Git-aware CGI to provide dumb HTTP transport
8154 http-backend: Protect GIT_PROJECT_ROOT from /../ requests
8155 t5551-http-fetch: Work around some libcurl versions
8156 t5551-http-fetch: Work around broken Accept header in libcurl
8157 http-backend: Fix bad treatment of uintmax_t in Content-Length
8160 rebase -i: fix reword when using a terminal editor
8161 gitweb: linkify author/committer names with search
8162 t1402: Make test executable
8163 t1200: cleanup and modernize test style
8164 t1200: Make documentation and test agree
8165 t3101: test more ls-tree options
8166 ls-tree: migrate to parse-options
8168 Tarmigan Casebolt (3):
8169 Check the format of more printf-type functions
8170 http-backend: Fix access beyond end of string.
8171 http-backend: Let gcc check the format of more printf-type functions.
8174 http-push: fix check condition on http.c::finish_http_pack_request()
8175 t5540-http-push: remove redundant fetches
8178 Documentation: update pt-BR
8181 bash completion: complete refs for git-grep
8182 Let --decorate show HEAD position
8183 Refactor pretty_print_commit arguments into a struct
8184 reflog-walk: refactor the branch@{num} formatting
8185 Introduce new pretty formats %g[sdD] for reflog information
8186 stash list: use new %g formats instead of sed
8187 stash list: drop the default limit of 10 stashes
8188 describe: when failing, tell the user about options that work
8189 filter-branch: stop special-casing $filter_subdir argument
8190 filter-branch: nearest-ancestor rewriting outside subdir filter
8191 Documentation: clarify 'ours' merge strategy
8192 rebase docs: clarify --merge and --strategy
8193 Document git-svn's first-parent rule
8194 describe: do not use unannotated tag even if exact match
8197 git svn: handle SVN merges from revisions past the tip of the branch
8200 git-gui: adjust the minimum height of diff pane for shorter screen height
8203 git-update-index.txt: Document the --really-refresh option.
8206 Version v1.6.5.9; changes since v1.6.5.8:
8207 -----------------------------------------
8209 Björn Gustavsson (3):
8210 Documentation: 'git add -A' can remove files
8211 git-add/rm doc: Consistently back-quote
8212 git-rm doc: Describe how to sync index & work tree
8215 Check size of path buffer before writing into it
8218 gitweb: Introduce esc_attr to escape attributes of HTML elements
8221 blame: prevent a segv when -L given start > EOF
8224 fix memcpy of overlapping area
8225 dwim_ref: fix dangling symref warning
8228 t8003: check exit code of command and error message separately
8232 diff: make sure --output=/bad/path is caught
8235 Remove extra '-' from git-am(1)
8238 octopus: make merge process simpler to follow
8239 octopus: reenable fast-forward merges
8240 octopus: remove dead code
8241 request-pull.txt: Document -p option
8244 stash pop: remove 'apply' options during 'drop' invocation
8246 Uwe Kleine-König (1):
8247 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
8250 Version v1.6.5.8; changes since v1.6.5.7:
8251 -----------------------------------------
8253 Andreas Gruenbacher (3):
8254 base85 debug code: Fix length byte calculation
8255 base85: encode_85() does not use the decode table
8256 base85: Make the code more obvious instead of explaining the non-obvious
8259 git count-objects: handle packs bigger than 4G
8261 Björn Gustavsson (1):
8262 rebase -i: abort cleanly if the editor fails to launch
8265 Prevent git blame from segfaulting on a missing author name
8268 fast-import: tag may point to any object type
8271 commit: --cleanup is a message option
8274 reset: unbreak hard resets with GIT_WORK_TREE
8275 textconv: stop leaking file descriptors
8278 grep: NUL terminate input from a file
8281 checkout -m: do not try to fall back to --merge from an unborn branch
8282 Fix mis-backport of t7002
8286 branch: die explicitly why when calling "git branch [-a|-r] branchname".
8288 Nguyễn Thái Ngọc Duy (1):
8289 t7102: make the test fail if one of its check fails
8292 api-strbuf.txt: fix typos and document launch_editor()
8293 technical-docs: document hash API
8296 bash completion: factor submodules into dirty state
8299 Version v1.6.5.7; changes since v1.6.5.6:
8300 -----------------------------------------
8303 ignore unknown color configuration
8306 help.autocorrect: do not run a command if the command given is junk
8309 worktree: don't segfault with an absolute pathspec without a work tree
8312 Nanako Shiraishi (1):
8313 Illustrate "filter" attribute with an example
8316 Version v1.6.5.6; changes since v1.6.5.5:
8317 -----------------------------------------
8320 pull: clarify advice for the unconfigured error case
8323 add-interactive: fix deletion of non-empty files
8326 Remove post-upload-hook
8327 Fix archive format with -- on the command line
8331 merge-recursive: make the error-message generation an extern function
8332 builtin-merge: show user-friendly error messages for fast-forward too.
8335 Version v1.6.5.5; changes since v1.6.5.4:
8336 -----------------------------------------
8339 builtin-merge.c: call exclude_cmds() correctly.
8342 t4201: use ISO8859-1 rather than ISO-8859-1
8345 grep: Allow case insensitive search of fixed-strings
8347 Felipe Contreras (2):
8348 format-patch: fix parsing of "--" on the command line
8349 format-patch: add test for parsing of "--"
8352 diffcore-break: free filespec data as we go
8353 diffcore-break: save cnt_data for other phases
8354 rerere: don't segfault on failure to open rr-cache
8355 reset: improve worktree safety valves
8358 diffcore-rename: reduce memory footprint by freeing blob data early
8359 Documentation: avoid xmlto input error
8360 Protect scripted Porcelains from GREP_OPTIONS insanity
8361 Remove dead code from "git am"
8362 Documentation: xmlto 0.0.18 does not know --stringparam
8367 Fix diff -B/--dirstat miscounting of newly added contents
8369 Lukas Sandström (1):
8370 git am/mailinfo: Don't look at in-body headers when rebasing
8372 Matthew Ogilvie (1):
8373 core.autocrlf documentation: mention the crlf attribute
8376 Expand ~ and ~user in core.excludesfile, commit.template
8377 expand_user_path: expand ~ to $HOME, not to the actual homedir.
8378 merge-recursive: point the user to commit when file would be overwritten.
8379 user-manual: Document that "git merge" doesn't like uncommited changes.
8382 give priority to progress messages
8384 Philippe Bruhat (1):
8385 Make sure $PERL_PATH is defined when the test suite is run.
8388 Add branch management for releases to gitworkflows
8390 Ramsay Allan Jones (3):
8391 Makefile: merge two Cygwin configuration sections into one
8392 t9700-perl-git.sh: Fix a test failure on Cygwin
8393 git-count-objects: Fix a disk-space under-estimate on Cygwin
8396 mergetool--lib: simplify guess_merge_tool()
8397 archive: clarify description of path parameter
8400 Update 'git remote update' usage string to match man page.
8401 git remote: Separate usage strings for subcommands
8404 Documentation: Avoid use of xmlto --stringparam
8406 Uwe Kleine-König (1):
8407 shortlog: respect commit encoding
8410 Version v1.6.5.4; changes since v1.6.5.3:
8411 -----------------------------------------
8414 help: Do not unnecessarily look for a repository
8416 David Soria Parra (1):
8417 Documentation: Document --branch option in git clone synopsis
8420 Documentation: undocument gc'd function graph_release()
8423 prune-packed: only show progress when stderr is a tty
8426 builtin-apply.c: pay attention to -p<n> when determining the name
8427 Do not misidentify "git merge foo HEAD" as an old-style invocation
8428 merge: do not add standard message when message is given with -m option
8430 Documentation/Makefile: allow man.base.url.for.relative.link to be set from Make
8431 Unconditionally set man.base.url.for.relative.links
8434 Michael J Gruber (1):
8435 Documentation: Fix a few i.e./e.g. mix-ups
8438 pack-objects: split implications of --all-progress from progress activation
8441 instaweb: restart server if already running
8444 Version v1.6.5.3; changes since v1.6.5.2:
8445 -----------------------------------------
8447 Björn Gustavsson (1):
8448 git-clone.txt: Fix grammar and formatting
8450 Björn Steinbrink (1):
8451 pre-commit.sample: Diff against the empty tree when HEAD is invalid
8453 Clemens Buchacher (1):
8454 modernize fetch/merge/pull examples
8456 Daniel Barkalow (2):
8457 Require a struct remote in transport_get()
8458 Allow curl helper to work without a local repository
8460 Dmitry V. Levin (1):
8461 Makefile: add compat/bswap.h to LIB_H
8464 help -i: properly error out if no info viewer can be found
8467 More precise description of 'git describe --abbrev'
8468 Fix documentation grammar typo
8470 Giuseppe Bilotta (1):
8471 gitweb: fix esc_param
8474 gitweb: Do not show 'patch' link for merge commits
8477 rebase -i: more graceful handling of invalid commands
8480 Documentation/fetch-options.txt: order options alphabetically
8481 Documentation/git-pull.txt: Add subtitles above included option files
8482 Documentation/merge-options.txt: order options in alphabetical groups
8485 cvsimport: fix relative argument filenames
8486 push: always load default config
8487 add-interactive: handle deletion of empty files
8488 ls-files: unbreak "ls-files -i"
8489 push: fix typo in usage
8490 format-patch: make "-p" suppress diffstat
8492 Johannes Schindelin (3):
8493 blame: make sure that the last line ends in an LF
8494 help -a: do not unnecessarily look for a repository
8495 diff --color-words -U0: fix the location of hunk headers
8497 Jonathan Nieder (4):
8498 clone: detect extra arguments
8499 Add intermediate build products to .gitignore
8500 check-ref-format: update usage string
8501 merge: do not setup worktree twice
8503 Junio C Hamano (22):
8504 apply --whitespace=fix: fix handling of blank lines at the eof
8505 apply --whitespace=fix: detect new blank lines at eof correctly
8506 apply.c: split check_whitespace() into two
8507 apply --whitespace=warn/error: diagnose blank at EOF
8508 apply --whitespace: warn blank but not necessarily empty lines at EOF
8509 diff.c: the builtin_diff() deals with only two-file comparison
8510 diff --whitespace=warn/error: obey blank-at-eof
8511 diff --whitespace=warn/error: fix blank-at-eof check
8512 diff --color: color blank-at-eof
8513 core.whitespace: split trailing-space into blank-at-{eol,eof}
8514 diff --whitespace: fix blank lines at end
8515 diff.c: shuffling code around
8516 diff.c: split emit_line() from the first char and the rest of the line
8517 diff.c: emit_add_line() takes only the rest of the line
8518 diff -B: colour whitespace errors
8519 info/grafts: allow trailing whitespaces at the end of line
8520 gc --auto --quiet: make the notice a bit less verboase
8521 receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
8522 clone: fix help on options
8523 diff --color-words: bit of clean-up
8524 check-ref-format -h: it does not know the --print option yet
8527 Markus Heidelberg (1):
8528 t4034-diff-words: add a test for word diff without context
8531 gitweb: Fix blob linenr links in pathinfo mode
8533 Sebastian Schuberth (1):
8534 Do not try to remove directories when removing old links
8537 git-add.txt: fix formatting of --patch section
8540 Quote ' as \(aq in manpages
8543 Makefile: Ensure rpm packages can be read by older rpm versions
8546 imap-send.c: fix compiler warnings for OpenSSL 1.0
8549 Version v1.6.5.2; changes since v1.6.5.1:
8550 -----------------------------------------
8553 Work around option parsing bug in the busybox tar implementation
8555 Carlos R. Mafra (1):
8556 Makefile: clean block-sha1/ directory instead of mozilla-sha1/
8559 ls-files: excludes should not impact tracked files
8560 document push's new quiet option
8563 git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
8566 Remove a left-over file from t/t5100
8567 Mark files in t/t5100 as UTF-8
8569 Jonathan Nieder (1):
8570 Documentation: describe check-ref-format --branch
8573 Fix incorrect error check while reading deflated pack data
8574 Do not fail "describe --always" in a tag-less repository
8575 Fix list of released versions in the toc document
8578 Markus Heidelberg (1):
8579 t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test
8582 Documentation/git-gc.txt: change "references" to "reference"
8584 Nanako Shiraishi (2):
8585 git push: remove incomplete options list from help text
8586 git push: say that --tag can't be used with --all or --mirror in help text
8588 Nasser Grainawi (1):
8589 Document `delta` attribute in "git help attributes".
8592 git-add--interactive: never skip files included in index
8595 Version v1.6.5.1; changes since v1.6.5:
8596 ---------------------------------------
8598 Björn Steinbrink (1):
8599 clone: Supply the right commit hash to post-checkout when -b is used
8602 remote-curl: add missing initialization of argv0_path
8608 grep: do not segfault when -f is used
8611 git-stash documentation: mention default options for 'list'
8614 change throughput display units with fast links
8616 Shawn O. Pearce (1):
8617 sha1_file: Fix infinite loop when pack is corrupted
8620 Version v1.6.5; changes since v1.6.5-rc3:
8621 -----------------------------------------
8623 Alexander Gavrilov (1):
8624 git-svn: Avoid spurious errors when rewriteRoot is used.
8627 ls-files: die instead of fprintf/exit in -i error
8629 Björn Gustavsson (1):
8630 bash: add support for 'git replace'
8633 Makefile: enable THREADED_DELTA_SEARCH on IRIX and IRIX64
8634 Makefile: add a note about the NO_MMAP setting on IRIX and IRIX64
8636 Christian Himpel (2):
8637 git-am: fixed patch_format detection according to RFC2822
8638 git-am: force egrep to use correct characters set
8641 increase portability of NORETURN declarations
8642 add NORETURN_PTR for function pointers
8644 Felipe Contreras (1):
8645 send-email: fix mutt regex for grouped aliases
8647 Ingmar Vanhassel (1):
8648 import-tars: Add missing closing bracket
8651 improve reflog date/number heuristic
8652 pull: improve advice for unconfigured error case
8654 Jonathan Nieder (8):
8655 Describe DOCBOOK_XSL_172, ASCIIDOC_NO_ROFF options in Makefile
8656 Documentation: git fmt-merge-msg does not have to be a script
8657 Documentation: clarify mergeoptions description
8658 Documentation: branch: update --merged description
8659 Documentation: clarify branch creation
8660 Documentation: clarify "working tree" definition
8661 racy-git.txt: explain nsec problem in more detail
8662 Documentation: clone: clarify discussion of initial branch
8665 Update draft release notes to 1.6.5
8668 Ramsay Allan Jones (2):
8669 Fix MSVC build on cygwin
8670 Fix the exit code of MSVC build scripts on cygwin
8673 Git archive and trailing "/" in prefix
8676 git-svn: hide find_parent_branch output in double quiet mode
8679 completion: fix completion of git <TAB><TAB>
8680 completion: fix alias listings with newlines
8683 Version v1.6.5-rc3; changes since v1.6.5-rc2:
8684 ---------------------------------------------
8687 filter-branch: add --prune-empty to option summary
8690 parse-opt: ignore negation of OPT_NONEG for ambiguity checks
8693 perl/Makefile.PL: detect MakeMaker versions incompatible with DESTDIR
8694 Documentation/git-gc.txt: default --aggressive window is 250, not 10
8695 Makefile: enable THREADED_DELTA_SEARCH on SunOS
8697 Frederik Schwarzer (1):
8698 Correct minor typo in post-receive hook template
8701 typo fix: Directory `...' exist, ...: s/exist/exists/
8704 Fix '--relative-date'
8707 builtin-mailinfo.c: check error status from rewind and ftruncate
8708 show-branch: fix segfault when showbranch.default exists
8709 git-pull: dead code removal
8710 fast-import.c::validate_raw_date(): really validate the value
8713 tests: make all test files executable
8716 generators/vcproj.pm: remove UNICODE from build
8719 git branch -D: give a better error message when lockfile creation fails
8722 make 'git clone' ask the remote only for objects it cares about
8724 Ramsay Allan Jones (1):
8725 Fix some printf format warnings
8728 bash: teach 'git checkout' options
8730 Sebastian Schuberth (2):
8731 Make generated MSVC solution file open from Windows Explorer
8732 Make just opening the generated MSVC solution file not modify it
8735 README: git lives at http://git-scm.com these days
8738 completion: update am, commit, and log
8739 completion: add dirstat and friends to diff options
8742 send-email: fix obscure error when encryption=tls and smtp cannot connect
8745 Version v1.6.5-rc2; changes since v1.6.5-rc1:
8746 ---------------------------------------------
8748 Clemens Buchacher (2):
8749 test local clone by copying
8750 cvs: initialize empty password
8753 git-archive: add '-o' as a alias for '--output'
8754 git-archive: infer output format from filename when unspecified
8757 Avoid declaration after statement
8758 Change regerror() declaration from K&R style to ANSI C (C89)
8759 Fix __stdcall placement and function prototype
8760 Test for WIN32 instead of __MINGW32_
8761 Add MinGW header files to build git with MSVC
8762 Add platform files for porting to MSVC
8765 remove logical typo in documentation of sample update hook
8766 web--browse: fix Mac OS X GUI detection for 10.6
8769 pre-commit.sample: add comment re tr portability; fix grammar
8771 Johannes Gilger (1):
8772 git-clone doc: typofix
8775 test-genrandom: ensure stdout is set to _O_BINARY on Windows
8778 git-commit doc: remove duplicated --dry-run description
8779 http.c: avoid freeing an uninitialized pointer
8781 Update Release Notes to 1.6.5
8782 pay attention to DESTDIR when building with NO_PERL_MAKEMAKER
8783 pull: Clarify "helpful" message for another corner case
8785 Marius Storm-Olsen (9):
8786 Add include guards to compat/win32.h
8787 Set _O_BINARY as default fmode for both MinGW and MSVC
8788 Add empty header files for MSVC port
8789 Make usage of windows.h lean and mean
8790 Define strncasecmp and ftruncate for MSVC
8791 Add MSVC to Makefile
8792 Add README for MSVC build
8793 Add scripts to generate projects for other buildsystems (MSVC vcproj, QMake)
8794 Tag GIT_VERSION when Git is built with MSVC
8797 push: Correctly initialize nonfastforward in transport_push.
8800 git-push: Accept -n as a synonym for --dry-run.
8803 Nicolas Pitre has a new email address
8806 gitk: Work around leftover temporary save file
8809 gitk: Show diff of commits at end of compare-commits output
8812 gitk: Update Swedish translation (280t0f0u)
8815 bash: rename __git_find_subcommand() to __git_find_on_cmdline()
8816 bash: update 'git stash' completion
8817 bash: teach 'git reset --patch'
8820 Update the usage bundle string.
8821 pack-objects: remove SP at the end of usage string
8822 Update "describe" documentation to match reality
8825 completion: Replace config --list with --get-regexp
8828 Version v1.6.5-rc1; changes since v1.6.5-rc0:
8829 ---------------------------------------------
8831 Brian Gernhardt (4):
8832 INSTALL: Update description of our SHA-1 code
8833 Makefile: Add NEEDS_CRYPTO_WITH_SSL
8834 INSTALL: Reorder dependencies, split shell and Perl
8835 INSTALL: Describe dependency knobs from Makefile
8837 Clemens Buchacher (3):
8838 grep: fix exit status if external_grep() punts
8839 grep: accept relative paths outside current working directory
8840 preserve mtime of local clone
8842 Daniel Barkalow (4):
8843 Add support for external programs for handling native fetches
8844 Use an external program to implement fetching with curl
8845 Make the "traditionally-supported" URLs a special case
8846 Use a clearer style to issue commands to remote helpers
8849 Improve --patch option documentation in git-add
8852 Makefile: git-http-fetch does not need expat
8853 push: make non-fast-forward help message configurable
8854 status: make "how to stage" messages optional
8855 rebase: use plumbing to show dirty state
8858 use write_str_in_full helper to avoid literal string lengths
8859 use write_str_in_full helper to avoid literal string lengths
8860 don't dereference NULL upon fdopen failure
8863 start_command: do not clobber cmd->env on Windows code path
8864 pager: set LESS=FRSX also on Windows
8867 Wrap rewrite globals in a struct in preparation for adding another set
8868 Add url.<base>.pushInsteadOf: URL rewriting for push only
8871 Makefile: do not link three copies of git-remote-* programs
8872 Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
8873 merge-recursive: give less scary messages when merge did not start
8874 Makefile: remove remnant of separate http/https/ftp helpers
8876 quiltimport documentation: --dry-run and -n are synonyms
8880 git-http-fetch: not a builtin
8883 svn: properly escape arguments for authors-prog
8885 Martin Nordholts (1):
8886 git.el: Use git-add-file for unmerged files, remove git-resolve-file
8889 wrap git's main usage string.
8892 Add transport native helper executables to .gitignore
8893 http-fetch: Fix Makefile dependancies
8895 Nicolas Sebrecht (2):
8896 mailinfo: add '--scissors' to usage message
8897 add documentation for mailinfo.scissors and '--no-scissors'
8900 import-tars: Allow per-tar author and commit message.
8901 Add script for importing bits-and-pieces to Git.
8904 git-p4: Avoid modules deprecated in Python 2.6.
8907 http.c: remove verification of remote packs
8910 Version v1.6.5-rc0; changes since v1.6.4.5:
8911 -------------------------------------------
8914 svn: Add && to t9107-git-svn-migrate.sh
8915 svn: Honor --prefix option in init without --stdlayout
8916 svn: allow branches outside of refs/remotes
8919 graph API: use a new color when starting a brand new column
8920 graph API: fix bug in graph_is_interesting()
8921 Add tests for rev-list --graph with options that simplify history
8924 Add a reminder test case for a merge with F/D transition
8925 Add date formatting and parsing functions relative to a given time
8927 Alexandre Julliard (1):
8928 read-tree: Fix regression with creation of a new index file.
8930 André Goddard Rosa (1):
8931 Fix typos on pt_BR/gittutorial.txt translation
8933 Benjamin Kramer (1):
8934 gitweb: Optimize git-favicon.png
8936 Björn Steinbrink (1):
8937 git-describe: Die early if there are no possible descriptions
8940 strbuf: add new function strbuf_getwholeline()
8941 builtin-mailinfo,builtin-mailsplit: use strbufs
8942 builtin-mailsplit.c: remove read_line_with_nul() since it is no longer used
8943 block-sha1/sha1.c: silence compiler complaints by casting void * to char *
8944 git-compat-util.h: remove superfluous test for __sun__
8945 Makefile: remove pointless conditional assignment in SunOS section
8946 abspath.c: move declaration of 'len' into inner block and use appropriate type
8947 commit.c: rename variable named 'n' which masks previous declaration
8948 t/test-lib.sh: provide a shell implementation of the 'yes' utility
8950 Brian Gianforcaro (1):
8951 Style fixes, add a space after if/for/while.
8953 Christian Couder (13):
8954 refs: add a "for_each_replace_ref" function
8955 replace_object: add mechanism to replace objects found in "refs/replace/"
8956 sha1_file: add a "read_sha1_file_repl" function
8957 object: call "check_sha1_signature" with the replacement sha1
8958 replace_object: add a test case
8959 mktag: call "check_sha1_signature" with the replacement sha1
8960 environment: add global variable to disable replacement
8961 Add new "git replace" command
8962 builtin-replace: teach "git replace" to actually replace
8963 parse-options: add new function "usage_msg_opt"
8964 builtin-replace: use "usage_msg_opt" to give better error messages
8965 Documentation: add documentation for "git replace"
8966 t6050: check pushing something based on a replaced commit
8969 Add git-replace to .gitignore
8972 git.el: Clarify documentation of git-commit-tree
8974 David Soria Parra (1):
8975 run-command.c: squelch a "use before assignment" warning
8978 git-cvsimport: add support for cvs pserver password scrambling.
8981 svn: initial "master" points to trunk if possible
8982 svn: (cleanup) use predefined constant for rev_map_fmt
8983 svn: assume URLs from the command-line are URI-encoded
8985 Geoffrey Irving (1):
8986 git fast-export: add --no-data option
8988 Giuseppe Bilotta (3):
8989 gitweb: fix 'Use of uninitialized value' error in href()
8990 git apply: option to ignore whitespace differences
8991 gitweb: pull ref markes pull out of subject <a> element
8994 cvsimport: add test illustrating a bug in cvsps
8995 cvsimport: extend testcase about patchset order to contain branches
8998 gitweb: Make .error style generic
8999 gitweb: Mark boundary commits in 'blame' view
9000 gitweb: Use "previous" header of git-blame -p in 'blame' view
9001 gitweb: Mark commits with no "previous" in 'blame' view
9002 gitweb: Add author initials in 'blame' view, a la "git gui blame"
9003 gitweb: Use light/dark for class names also in 'blame' view
9006 git-tag(1): Refer to git-check-ref-format(1) for <name>
9009 push: add --quiet flag
9010 transport: pass "quiet" flag to pack-objects
9011 transport: don't show push status if --quiet is given
9012 tests: use "$TEST_DIRECTORY" instead of ".."
9013 tests: provide $TRASH_DIRECTORY variable
9014 tests: allow user to specify trash directory location
9015 t/Makefile: include config.mak
9016 allow pull --rebase on branch yet to be born
9017 tests: disable interactive hunk selection tests if perl is not available
9018 clone: add --branch option to select a different HEAD
9019 refactor test-date interface
9020 tests: add date printing and parsing tests
9021 fix approxidate parsing of relative months and years
9022 push: teach --quiet to suppress "Everything up-to-date"
9025 Check return value of ftruncate call in http.c
9028 git submodule summary: add --files option
9031 git submodule foreach: Provide access to submodule name, as '$name'
9032 git submodule: Cleanup usage string and add option parsing to cmd_foreach()
9033 Add selftest for 'git submodule foreach'
9034 git submodule foreach: test access to submodule name as '$name'
9035 git submodule foreach: Add --recursive to recurse into nested submodules
9036 git submodule update: Introduce --recursive to update nested submodules
9037 git submodule status: Add --recursive to recurse into nested submodules
9038 t7407: Use 'rev-parse --short' rather than bash's substring expansion notation
9039 git clone: Add --recursive to automatically checkout (nested) submodules
9041 Johannes Schindelin (2):
9042 Make 'git stash -k' a short form for 'git stash save --keep-index'
9043 parse-opt: optionally show "--no-" option string
9046 MinGW: simplify waitpid() emulation macros
9047 run_command: return exit code as positive value
9048 run_command: report system call errors instead of returning error codes
9049 run_command: encode deadly signal number in the return value
9050 run_command: report failure to execute the program, but optionally don't
9051 receive-pack: remove unnecessary run_status report
9052 api-run-command.txt: describe error behavior of run_command functions
9053 t0001-init: fix a file name
9054 t0001-init: split the existence test from the permission test
9055 gitk: Do not hard-code "encoding" in attribute lookup functions
9056 Make test number t7406- unique
9057 Make test case number unique
9058 status: list unmerged files much later
9060 Junio C Hamano (31):
9061 t/t9600: remove exit after test_done
9063 request-pull: optionally show a patch as well
9064 diff-index: report unmerged new entries
9065 diff-index: keep the original index intact
9066 Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings
9067 wt-status.c: rework the way changes to the index and work tree are summarized
9068 git-rev-list.txt: Clarify the use of multiple revision arguments
9069 block-sha1: undo ctx->size change
9070 block-sha1: minor fixups
9071 am: allow individual e-mail files as input
9072 status: show worktree status of conflicted paths separately
9073 verify-pack --stat-only: show histogram without verifying
9075 wt-status: move many global settings to wt_status structure
9076 wt-status: move wt_status_colors[] into wt_status structure
9077 Make git_status_config() file scope static to builtin-commit.c
9078 wt-status: collect untracked files in a separate "collect" phase
9079 Documentation/git-commit.txt: describe --dry-run
9080 git commit --dry-run -v: show diff in color when asked
9081 compat/snprintf.c: clarify SNPRINTF_SIZE_CORR
9082 builtin-mailinfo.c: fix confusing internal API to mailinfo()
9083 Teach mailinfo to ignore everything before -- >8 -- mark
9084 am/mailinfo: Disable scissors processing by default
9085 mailinfo.scissors: new configuration
9086 Draft release notes to 1.6.5 before -rc0
9087 upload-pack: add a trigger for post-upload-pack hook
9088 upload-pack: feed "kind [clone|fetch]" to post-upload-pack hook
9089 builtin-pack-objects.c: avoid vla
9090 builtin-apply.c: get rid of an unnecessary use of temporary array
9094 git-svn: Use GIT_SSH setting if SVN_SSH is not set
9097 Documentaqtion/git-submodule.txt: Typofix
9098 git-log: allow --decorate[=short|full]
9100 Linus Torvalds (12):
9101 Add new optimized C 'block-sha1' routines
9102 block-sha1: try to use rol/ror appropriately
9103 block-sha1: make the 'ntohl()' part of the first SHA1 loop
9104 block-sha1: re-use the temporary array as we calculate the SHA1
9105 block-sha1: macroize the rounds a bit further
9106 block-sha1: Use '(B&C)+(D&(B^C))' instead of '(B&C)|(D&(B|C))' in round 3
9107 block-sha1: get rid of redundant 'lenW' context
9108 block-sha1: perform register rotation using cpp
9109 block-sha1: improved SHA1 hashing
9110 block-sha1: improve code on large-register-set machines
9111 Improve on 'approxidate'
9112 Further 'approxidate' improvements
9115 git-p4: stream from perforce to speed up clones
9118 gitweb: support to globally disable a snapshot format
9119 gitweb: update INSTALL regarding specific snapshot settings
9120 gitweb: add support for XZ compressed snapshots
9123 gitweb: improve snapshot error handling
9124 gitweb: split test suite into library and tests
9125 gitweb: add t9501 tests for checking HTTP status codes
9128 rebase: consistent error messages for staged and unstaged changes.
9129 git-ls-files.txt: clarify what "other files" mean for --other
9130 Show usage string for 'git log -h', 'git show -h' and 'git diff -h'
9131 Rename REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAIN.
9132 reset: make the reminder output consistent with "checkout"
9133 stash: simplify defaulting to "save" and reject unknown options
9135 Michael Haggerty (6):
9136 Start a library for cvsimport-related tests
9137 Use CVS's -f option if available (ignore user's ~/.cvsrc file)
9138 Test contents of entire cvsimported "master" tree contents
9139 Add some tests of git-cvsimport's handling of vendor branches
9140 Add a test of "git cvsimport"'s handling of tags and branches
9141 git-svn: ignore leading blank lines in svn:ignore
9143 Michael J Gruber (3):
9144 t6010-merge-base.sh: Depict the octopus test graph
9145 git-merge-base/git-show-branch: Cleanup documentation and usage
9146 git-merge-base/git-show-branch --merge-base: Documentation and test
9148 Michał Kiedrowicz (2):
9149 init-db: migrate to parse-options
9150 grep: Add --max-depth option.
9152 Nanako Shiraishi (3):
9153 git init: optionally allow a directory argument
9154 Documentation: consistently refer to check-ref-format
9155 Documentation: describe the scissors mark support of "git am"
9157 Nguyễn Thái Ngọc Duy (1):
9158 Prevent diff machinery from examining assume-unchanged entries on worktree
9161 Shift object enumeration out of upload-pack
9164 block-sha1: move code around
9165 block-sha1: split the different "hacks" to be individually selected
9166 block-sha1: support for architectures with memory alignment restrictions
9167 block-sha1: more good unaligned memory access candidates
9168 block-sha1: make the size member first in the context struct
9169 make sure byte swapping is optimal for git
9170 block-sha1: guard gcc extensions with __GNUC__
9171 remove ARM and Mozilla SHA1 implementations
9172 fix simple deepening of a repo
9173 make shallow repository deepening more network efficient
9174 pack-objects: free preferred base memory after usage
9176 Nicolas Sebrecht (1):
9177 git-am: print fair error message when format detection fails
9180 git stash: Give friendlier errors when there is nothing to apply
9183 Do not scramble password read from .cvspass
9186 update-server-info: make builtin, use parseopt
9187 UI consistency: allow --force for where -f means force
9190 read-tree: convert unhelpful usage()'s to helpful die()'s
9191 read-tree: migrate to parse-options
9192 write-tree: migrate to parse-options
9193 verify-tag: migrate to parse-options
9194 verify-pack: migrate to parse-options
9195 prune-packed: migrate to parse-options
9196 technical-docs: document tree-walking API
9199 http.c: free preq when aborting
9200 http.c: replace usage of temporary variable for urls
9202 Thadeu Lima de Souza Cascardo (1):
9203 Translate the tutorial to Brazillian Portuguese
9206 Document 'stash clear' recovery via unreachable commits
9207 gitk: New option to hide remote refs
9208 gitk: Fix direction of symmetric difference in optimized mode
9209 gitk: Parse arbitrary commit-ish in SHA1 field
9210 git-apply--interactive: Refactor patch mode code
9211 Add a small patch-mode testing library
9212 builtin-add: refactor the meat of interactive_add()
9213 Implement 'git reset --patch'
9214 Implement 'git checkout --patch'
9215 Implement 'git stash save --patch'
9216 DWIM 'git stash save -p' for 'git stash -p'
9219 git-svn.txt: Fix location of parent argument
9221 Wesley J. Landaker (2):
9222 Documentation: git-send-email: fix submission port number
9223 Documentation: git-send-email: correct statement about standard ports
9226 Add support for the Mongoose web server.
9229 Version v1.6.4.5; changes since v1.6.4.4:
9230 -----------------------------------------
9232 Andreas Gruenbacher (3):
9233 base85 debug code: Fix length byte calculation
9234 base85: encode_85() does not use the decode table
9235 base85: Make the code more obvious instead of explaining the non-obvious
9238 git count-objects: handle packs bigger than 4G
9241 ls-files: die instead of fprintf/exit in -i error
9244 help -i: properly error out if no info viewer can be found
9247 Check size of path buffer before writing into it
9250 commit: --cleanup is a message option
9253 gitweb: Introduce esc_attr to escape attributes of HTML elements
9256 rebase -i: more graceful handling of invalid commands
9259 ls-files: excludes should not impact tracked files
9260 textconv: stop leaking file descriptors
9262 Jonathan Nieder (1):
9263 Documentation: describe check-ref-format --branch
9266 show-branch: fix segfault when showbranch.default exists
9267 fast-import.c::validate_raw_date(): really validate the value
9268 checkout -m: do not try to fall back to --merge from an unborn branch
9269 Fix mis-backport of t7002
9273 grep: do not segfault when -f is used
9276 push: Correctly initialize nonfastforward in transport_push.
9277 branch: die explicitly why when calling "git branch [-a|-r] branchname".
9280 git-stash documentation: mention default options for 'list'
9282 Nguyễn Thái Ngọc Duy (1):
9283 t7102: make the test fail if one of its check fails
9285 Uwe Kleine-König (1):
9286 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
9289 Version v1.6.4.4; changes since v1.6.4.3:
9290 -----------------------------------------
9293 checkout: do not imply "-f" on unborn branches
9296 Fix "unpack-objects --strict"
9297 check_path(): allow symlinked directories to checkout-index --prefix
9298 xutils: Fix hashing an incomplete line with whitespaces at the end
9299 xutils: Fix xdl_recmatch() on incomplete lines
9300 http.c: avoid freeing an uninitialized pointer
9304 Version v1.6.4.3; changes since v1.6.4.2:
9305 -----------------------------------------
9308 githooks.txt: put hooks into subsections
9310 Clemens Buchacher (2):
9311 grep: fix exit status if external_grep() punts
9312 grep: accept relative paths outside current working directory
9314 Emmanuel Trillaud (1):
9315 git-pull: do not mention --quiet and --verbose twice
9318 git-cvsserver: no longer use deprecated 'git-subcommand' commands
9321 clone: disconnect transport after fetching
9322 push: fix english in non-fast-forward message
9323 push: re-flow non-fast-forward message
9329 svn: properly escape arguments for authors-prog
9332 git-clone: add missing comma in --reference documentation
9335 http.c: remove verification of remote packs
9338 Version v1.6.4.2; changes since v1.6.4.1:
9339 -----------------------------------------
9342 Minor improvement to the write-tree documentation
9345 Round-down years in "years+months" relative date view
9348 add tests for merge message headings
9349 merge: fix incorrect merge message for ambiguous tag/branch
9350 merge: indicate remote tracking branches in merge message
9352 Johannes Schindelin (2):
9353 Expose the has_non_ascii() function
9354 Correctly mark cover letters' encodings if they are not pure ASCII
9357 t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite
9360 apply: notice creation/removal patches produced by GNU diff
9361 clean: require double -f options to nuke nested git repository and work tree
9365 git add -p: demonstrate failure when staging both mode and hunk
9368 lstat_cache: guard against full match of length of 'name' parameter
9371 git-log: allow --decorate[=short|full]
9374 git-checkout: be careful about untracked symlinks
9376 Nanako Shiraishi (3):
9377 git-bisect: call the found commit "*the* first bad commit"
9378 Fix overridable written with an extra 'e'
9379 Remove unused t/t8005/iso8859-5.txt
9381 Pickens, James E (1):
9382 Demonstrate bugs when a directory is replaced with a symlink
9385 http.c: don't assume that urls don't end with slash
9386 http.c: set slot callback members to NULL when releasing object
9389 add -p: do not attempt to coalesce mode changes
9391 Wesley J. Landaker (1):
9392 Documentation: git-archive: mark --format as optional in summary
9395 Version v1.6.4.1; changes since v1.6.4:
9396 ---------------------------------------
9398 Björn Steinbrink (1):
9399 config: Keep inner whitespace verbatim
9402 send-email: remove debug trace
9405 gitweb/README: Document $base_url
9408 show: suppress extra newline when showing annotated tag
9409 show: add space between multiple items
9410 docs: describe impact of repack on "clone -s"
9413 Documentation: git submodule: add missing options to synopsis
9416 help.c: give correct structure's size to memset()
9418 Johannes Schindelin (1):
9419 filter-branch: add an example how to add ACKs to a range of commits
9422 merge-recursive: don't segfault while handling rename clashes
9423 t5510: harden the way verify-pack is used
9424 verify-pack -v: do not report "chain length 0"
9425 am: allow individual e-mail files as input
9429 git-instaweb: fix mod_perl detection for apache2
9432 Better usage string for reflog.
9433 push: point to 'git pull' and 'git push --force' in case of non-fast forward
9434 filter-branch: make the usage string fit on 80 chars terminals.
9437 hg-to-git: don't import the unused popen2 module
9440 don't let the delta cache grow unbounded in 'git repack'
9442 Nicolas Sebrecht (1):
9443 git-am: print fair error message when format detection fails
9446 Change mentions of "git programs" to "git commands"
9449 Documentation: merge: one <remote> is required
9450 Documentation: add: <filepattern>... is optional
9453 t5520-pull: Test for rebased upstream + fetch + pull --rebase
9454 pull: support rebased upstream + fetch + pull --rebase
9457 gitweb: parse_commit_text encoding fix
9460 Fix typos in git-remote.txt and git-symbolic-ref.txt
9463 Version v1.6.4; changes since v1.6.4-rc3:
9464 -----------------------------------------
9467 Update the documentation of the raw diff output format
9470 fast-export: Set revs.topo_order before calling setup_revisions
9471 fast-export: Omit tags that tag trees
9472 fast-export: Make sure we show actual ref names instead of "(null)"
9473 fast-export: Do parent rewriting to avoid dropping relevant commits
9474 fast-export: Add a --tag-of-filtered-object option for newly dangling tags
9475 Add new fast-export testcases
9476 fast-export: Document the fact that git-rev-list arguments are accepted
9479 t9143: do not fail if Compress::Zlib is missing
9482 Fix rebase -p --onto
9488 Michael J Gruber (1):
9489 git-rerere.txt: Clarify ambiguity of the config variable
9491 Sean Estabrooks (1):
9492 Trivial path quoting fixes in git-instaweb
9495 config.txt: document add.ignore-errors
9498 request-pull: allow ls-remote to notice remote.$nickname.uploadpack
9501 Version v1.6.4-rc3; changes since v1.6.4-rc2:
9502 ---------------------------------------------
9505 Make section_name_match start on '[', and return the length on success
9506 After renaming a section, print any trailing variable definitions
9508 Björn Steinbrink (1):
9509 Add a test showing that 'git repack' throws away grafted-away parents
9511 Daniel Trstenjak (1):
9512 Show the presence of untracked files in the bash prompt.
9515 git svn: fix shallow clone when upstream revision is too new
9516 git svn: revert default behavior for --minimize-url
9517 git svn: the branch command no longer needs the full path
9518 t9142: stop httpd after the test
9519 git svn: avoid escaping '/' when renaming/copying files
9520 git svn: make minimize URL more reliable over http(s)
9523 send-email: detect cycles in alias expansion
9525 Johannes Schindelin (1):
9526 git repack: keep commits hidden by a graft
9529 do_one_ref(): null_sha1 check is not about broken ref
9530 SunOS grep does not understand -C<n> nor -e
9531 Update release notes for 1.6.4
9532 Fix severe breakage in "git-apply --whitespace=fix"
9533 t8005: Nobody writes Russian in shift_jis
9537 git branch: fix performance problem
9538 git branch: avoid unnecessary object lookups
9539 git branch: clean up detached branch handling
9541 Matthias Andree (1):
9542 Fix export_marks() error handling.
9544 Nanako Shiraishi (1):
9545 Documentation/config.txt: a variable can be defined on the section header line
9547 Robert Allan Zeh (1):
9548 git svn: add gc command
9551 Disable asciidoc 8.4.1+ semantics for `{plus}` and friends
9554 Version v1.6.4-rc2; changes since v1.6.4-rc1:
9555 ---------------------------------------------
9558 refs.c: release file descriptor on error return
9559 sha1_name.c: avoid unnecessary strbuf_release
9560 configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests
9561 configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing
9564 git svn: rename tests that had conflicting numbers
9565 git svn: fix reparenting when ugly http(s) URLs are used
9568 checkout -f: deal with a D/F conflict entry correctly
9569 push: do not give big warning when no preference is configured
9570 Updates to draft release notes to 1.6.4
9571 combine-diff.c: fix performance problem when folding common deleted lines
9572 diff --cc: a lost line at the beginning of the file is shown incorrectly
9575 git stash: modernize use of "dashed" git-XXX calls
9577 Michael J Gruber (1):
9578 t4202-log.sh: Test git log --no-walk sort order
9581 cvsexportcommit: reorder tests to quiet intermittent failure
9583 Pierre Habouzit (4):
9584 janitor: use NULL and not 0 for pointers.
9585 refactor: use bitsizeof() instead of 8 * sizeof()
9586 janitor: add DIV_ROUND_UP and use it.
9587 janitor: useless checks before free
9590 Trailing whitespace and no newline fix
9593 List send-email config options in config.txt.
9594 Improve doc for format-patch threading options.
9597 Version v1.6.4-rc1; changes since v1.6.4-rc0:
9598 ---------------------------------------------
9600 Andreas Ericsson (1):
9601 mailinfo: Remove only one set of square brackets
9604 unpack-trees.c: work around run-time array initialization flaw on IRIX 6.5
9605 git-compat-util.h: adjust for SGI IRIX 6.5
9606 Makefile: add NEEDS_LIBGEN to optionally add -lgen to compile arguments
9607 Makefile: add section for SGI IRIX 6.5
9608 Makefile: update IRIX64 section
9611 git svn: allow uppercase UUIDs from SVN
9614 quickfetch(): Prevent overflow of the rev-list command line
9617 Makefile: keep "git" when bindir is execdir
9618 Revert "mailinfo: Remove only one set of square brackets"
9620 Linus Torvalds (10):
9621 Add 'fill_directory()' helper function for directory traversal
9622 Simplify read_directory[_recursive]() arguments
9623 Avoid doing extra 'lstat()'s for d_type if we have an up-to-date cache entry
9624 Avoid using 'lstat()' to figure out directories
9625 Prepare symlink caching for thread-safety
9626 Export thread-safe version of 'has_symlink_leading_path()'
9627 Make index preloading check the whole path to the file
9628 Make 'git show' more useful
9629 Improve on the 'invalid object' error message at commit time
9630 Fix extraneous lstat's in 'git checkout -f'
9632 Mattias Nissler (2):
9633 git-svn: Always duplicate paths returned from get_log
9634 git-svn: Fix branch detection when repository root is inaccessible
9637 Document 'git (rev-list|log) --merges'
9638 bash: add '--merges' to common 'git log' options
9640 Wincent Colaiuta (1):
9641 gitweb: update Git homepage URL
9644 Version v1.6.4-rc0; changes since v1.6.3.4:
9645 -------------------------------------------
9648 Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS working tree before applying commit patch
9651 Quote LF in urls git fetch saves in FETCH_HEAD
9652 Use UTF-8 instead of utf8 for backward compatibility
9653 Improve the naming of guessed target repository for git clone
9656 git-svn: Fix for svn paths removed > log-window-size revisions ago
9657 git-svn: Correctly report max revision when following deleted paths
9658 git-svn: Set svn.authorsfile if it is passed to git svn clone
9661 graph API: Use horizontal lines for more compact graphs
9663 Andreas Ericsson (1):
9664 fetch: Strip usernames from url's before storing them
9667 Add 'git svn help [cmd]' which works outside a repo.
9668 git-svn: speed up find_rev_before
9669 Add 'git svn reset' to unwind 'git svn fetch'
9671 Benjamin Kramer (1):
9672 imap-send: add support for IPv6
9675 builtin-remote: (get_one_entry): use strbuf
9677 Björn Steinbrink (1):
9678 git-apply(1): Clarify that one can select where to apply the patch
9681 t3900: use ancient iconv names for backward compatibility
9682 Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibility
9683 builtin-mailinfo.c: compare character encodings case insensitively
9684 builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as fallback encoding
9685 t3901: avoid negation on right hand side of '|'
9686 t3901: Use ISO8859-1 instead of ISO-8859-1 for backward compatibility
9687 t9301: use ISO8859-1 rather than ISO-8859-1
9688 t5100: use ancient encoding syntax for backwards compatibility
9689 t8005: use more portable character encoding names
9690 t8005: convert CP1251 character set to ISO8859-5
9691 t8005: fix typo, it's ISO-8859-5, not KOI8-R
9692 Makefile: use /usr/ucb/install on SunOS platforms rather than ginstall
9693 Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile arguments
9694 On Solaris choose the OLD_ICONV iconv() declaration based on the UNIX spec
9695 git-compat-util.h: tweak the way _XOPEN_SOURCE is set on Solaris
9696 Makefile: define __sun__ on SunOS
9697 Makefile: add section for SunOS 5.7
9698 git-compat-util.h: avoid using c99 flex array feature with Sun compiler 5.8
9699 git-send-email.perl: improve detection of MIME encoded-words
9700 send-email: use UTF-8 rather than utf-8 for consistency
9701 Makefile: Solaris needs HAVE_ALLOCA_H for alloca()
9702 t/t9001-send-email.sh: ensure generated script is executed with $SHELL_PATH
9703 git.c: avoid allocating one-too-many elements for new argv array
9705 Christian Couder (30):
9706 rev-list: make "estimate_bisect_steps" non static
9707 rev-list: refactor printing bisect vars
9708 bisect: move common bisect functionality to "bisect_common"
9709 bisect--helper: add "--next-exit" to output bisect results
9710 bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"
9711 bisect--helper: remove "--next-vars" option as it is now useless
9712 rev-list: remove stringed output flag from "show_bisect_vars"
9713 rev-parse: add --sq-quote to shell quote arguments
9714 bisect: use "git rev-parse --sq-quote" instead of a custom "sq" function
9715 am: simplify "sq" function by using "git rev-parse --sq-quote"
9716 bisect: use "sha1_array" to store skipped revisions
9717 bisect: implement "rev_argv_push" to fill an argv with revs
9718 bisect: store good revisions in a "sha1_array"
9719 bisect: use new "struct argv_array" to prepare argv for "setup_revisions"
9720 bisect: remove too much function nesting
9721 bisect: make skipped array functions more generic
9722 bisect: automatically sort sha1_array if needed when looking it up
9723 bisect: implement the "check_merge_bases" function
9724 bisect: add "check_good_are_ancestors_of_bad" function
9725 bisect: make "git bisect" use new "--next-all" bisect-helper function
9726 bisect: rework some rev related functions to make them more reusable
9727 commit: add function to unparse a commit and its parents
9728 bisect: check ancestors without forking a "git rev-list" process
9729 bisect: drop unparse_commit() and use clear_commit_marks()
9730 bisect: display first bad commit without forking a new process
9731 bisect: add parameters to "filter_skipped"
9732 bisect: when skipping, choose a commit away from a skipped commit
9733 t6030: test skipping away from an already skipped commit
9734 bisect: use a PRNG with a bias when skipping away from untestable commits
9735 Documentation: remove warning saying that "git bisect skip" may slow bisection
9737 Christian Stimming (1):
9738 gitk: Update German translation.
9740 Clemens Buchacher (5):
9741 http-push: reuse existing is_null_ref
9742 match_refs: search ref list tail internally
9743 test-lib: fail if invalid options are passed
9744 test-lib: allow exit trap to be used for cleanup by tests
9745 test-lib: fix http exit codes
9748 Unify signedness in hashing calls
9750 Daniel Trstenjak (1):
9751 Show presence of stashed changes in bash prompt.
9754 mergetool--lib: specialize diff options for emerge and ecmerge
9755 mergetool--lib: add support for araxis merge
9756 compat: add a mkstemps() compatibility function
9757 compat: add a basename() compatibility function
9758 diff: generate pretty filenames in prep_temp_blob()
9761 gitk: Add option 'Simple history' to the options menu
9764 connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
9767 gitk: Make more options easily accessible from Edit View dialog
9769 Eric W. Biederman (1):
9770 git-send-email: Handle quotes when parsing .mailrc files
9773 git-svn: refuse to dcommit non-UTF-8 messages
9774 git-svn: convert globs to regexps for branch destinations
9775 t9138: remove stray dot in test which broke bash
9776 Allow the Unix epoch to be a valid commit date
9778 Eygene Ryabinkin (1):
9779 git-svn testsuite: use standard configuration for Subversion tools
9781 Felipe Contreras (2):
9782 Change prettify_ref to prettify_refname
9783 Prettify log decorations even more
9785 Frank Lichtenheld (2):
9786 Git.pm: Set GIT_WORK_TREE if we set GIT_DIR
9787 Git.pm: Always set Repository to absolute path if autodetecting
9789 Giuseppe Bilotta (11):
9790 git-am foreign patch support: introduce patch_format
9791 git-am foreign patch support: autodetect some patch formats
9792 git-am foreign patch support: StGIT support
9793 git-am: refactor 'cleaning up and aborting'
9794 gitweb: refactor author name insertion
9795 gitweb: uniform author info for commit and commitdiff
9796 gitweb: use git_print_authorship_rows in 'tag' view too
9797 gitweb: (gr)avatar support
9798 gitweb: gravatar url cache
9799 gitweb: picon avatar provider
9800 gitweb: add empty alt text to avatar img
9803 Extend sample update hook, disable modifying of existing tags
9804 Extend sample pre-commit hook to check for non ascii filenames
9806 Hunter, D. Seth (1):
9807 http-push: fix xml_entities() string parsing overrun
9809 Jakub Narebski (10):
9810 gitweb: Remove function prototypes (cleanup)
9811 gitweb: Do not use bareword filehandles
9812 gitweb: Always use three argument form of open
9813 gitweb: Always use three argument form of open
9814 gitweb: Use block form of map/grep in a few cases more
9815 gitweb: Replace wrongly added tabs with spaces
9816 gitweb: Use capturing parentheses only when you intend to capture
9817 gitweb: Simplify snapshot format detection logic in evaluate_path_info
9818 gitweb: Remove unused $hash_base parameter from normalize_link_target
9819 gitweb: Sanitize title attribute in format_subject_html
9822 parseopt: add OPT_NEGBIT
9823 convert bare readlink to strbuf_readlink
9824 git-add: no need for -f when resolving a conflict in already tracked path
9825 Makefile: refactor regex compat support
9826 Makefile: use compat regex on Solaris
9827 log-tree: fix confusing comment
9828 Makefile: install 'git' in execdir
9831 post-receive-email: hooks.showrev: show how to include both web link and patch
9832 avoid NULL dereference on failed malloc
9835 Rename submodule.<name>.rebase to submodule.<name>.update
9836 git-submodule: add support for --merge.
9838 Johannes Schindelin (12):
9839 git-add: introduce --edit (to edit the diff vs. the index)
9840 t3702: fix reliance on SHELL_PATH being '/bin/sh'
9841 MinGW: the path separator to split GITPERLLIB is ';' on Win32
9842 MinGW: use POSIX signature of waitpid()
9843 MinGW: Add a simple getpass()
9844 MinGW: Fix compiler warning in merge-recursive
9845 MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore
9846 Quiet make: do not leave Windows behind
9847 Work around a regression in Windows 7, causing erase_in_line() to crash sometimes
9848 test-chmtime: work around Windows limitation
9849 MinGW: fix warning about implicit declaration of _getch()
9850 Fix warnings in nedmalloc when compiling with GCC 4.4.0
9853 gitk: Use --textconv to generate diff text
9854 Simplify some instances of run_command() by using run_command_v_opt().
9855 Simplify some 'fprintf(stderr); return -1;' by using 'return error()'
9856 Fix typo in nedmalloc warning fix
9857 compat/ has subdirectories: do not omit them in 'make clean'
9858 daemon: send stderr of service programs to the syslog
9859 upload-pack: squelch progress indicator if client cannot see it
9860 receive-pack: do not send error details to the client
9861 git-mv: fix directory separator treatment on Windows
9862 MinGW: truncate exit()'s argument to lowest 8 bits
9865 mktree --missing: updated usage message and man page
9866 mktree --batch: build more than one tree object
9867 mktree: validate entry type in input
9869 Junio C Hamano (22):
9870 Start 1.6.4 development
9872 mktree: use parse-options
9873 builtin-mktree.c: use a helper function to handle one line of input
9874 mktree: do not barf on a submodule commit
9875 t1010: add mktree test
9876 mktree --missing: allow missing objects
9877 t3900: ISO-2022-JP has more than one popular variants
9878 write-tree --ignore-cache-tree
9879 Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
9880 OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
9881 cache-tree.c::cache_tree_find(): simplify internal API
9882 t4007: modernize the style
9883 Optimize "diff-index --cached" using cache-tree
9884 Avoid "diff-index --cached" optimization under --find-copies-harder
9885 Update draft release notes to 1.6.4
9886 completion: fix PS1 display during an AM on detached HEAD
9887 Documentation/git.txt: update links to release notes
9888 Makefile: introduce SANE_TOOL_PATH for prepending required elements to PATH
9889 Makefile: test-parse-options depends on parse-options.h
9890 Makefile: insert SANE_TOOL_PATH to PATH before /bin or /usr/bin
9891 die_errno(): double % in strerror() output just in case
9894 symlinks.c: small style cleanup
9897 add --porcelain option to git-push
9900 Clean up and simplify rev_compare_tree()
9901 Fix various sparse warnings in the git source code
9902 git log: add '--merges' flag to match '--no-merges'
9905 git svn: Support multiple branch and tag paths in the svn repository.
9906 git svn: cleanup t9138-multiple-branches
9907 git svn: Doc update for multiple branch and tag paths
9909 Marius Storm-Olsen (2):
9910 MinGW readdir reimplementation to support d_type
9911 Add custom memory allocator to MinGW and MacOS builds
9914 git-svn: add --authors-prog option
9915 http.c: prompt for SSL client certificate password
9916 http.c: add http.sslCertPasswordProtected option
9918 Markus Heidelberg (10):
9919 show-branch: color the commit status signs
9920 bash completion: show-branch color support
9921 diff: do not color --stat output like patch context
9922 gitk: Allow diff view without context lines
9923 add a test for git-send-email for non-threaded mails
9924 send-email: fix non-threaded mails
9925 doc/send-email: clarify the behavior of --in-reply-to with --no-thread
9926 add a test for git-send-email for threaded mails without chain-reply-to
9927 send-email: fix threaded mails without chain-reply-to
9928 send-email: fix a typo in a comment
9931 Remove filename from conflict markers
9933 Michael J Gruber (9):
9934 Documentation: clarify / requirement in 'git check-ref-format'
9935 Test tracking of non-commit upstreams
9936 Fix behavior with non-commit upstream references
9937 Allow push and fetch urls to be different
9938 t5516: Check pushurl config setting
9939 technical/api-remote: Describe new struct remote member pushurl
9940 git-repack.txt: Clarify implications of -a for dumb protocols
9941 builtin-remote: Show push urls as well
9942 builtin-remote: Make "remote -v" display push urls
9944 Michael S. Tsirkin (1):
9945 Add --reference option to git submodule.
9948 Docs: send-email: Put options back into alphabetical order
9949 Docs: send-email: Refer to CONFIGURATION section for sendemail.multiedit
9950 Docs: send-email: --smtp-server-port can take symbolic ports
9951 send-email: Handle "GIT:" rather than "GIT: " during --compose
9952 send-email: 'References:' should only reference what is sent
9953 send-email: Remove superfluous `my $editor = ...'
9956 apply: handle filenames with double slashes better
9958 Michele Ballabio (1):
9959 gitk: Add another string to translation
9962 Don't expect verify_pack() callers to set pack_size
9963 transport.c::get_refs_via_curl(): do not leak refs_url
9964 http.c: new functions for the http API
9965 transport.c::get_refs_via_curl(): use the new http API
9966 http.c::http_fetch_ref(): use the new http API
9967 http-push.c::remote_exists(): use the new http API
9968 http-push.c::fetch_symref(): use the new http API
9970 Nguyễn Thái Ngọc Duy (3):
9971 doc/git-rebase.txt: remove mention of multiple strategies
9972 Terminate argv with NULL before calling setup_revisions()
9973 t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C
9976 diff-tree -r -t: include added/removed directories in the output
9979 git-cvsexportcommit can't commit files which have been removed from CVS
9980 Remove archaic use of regex capture \1 in favour of $1
9981 Avoid generating a warning if $fullname{$file} is undefined
9984 Test cccmd in t9001-send-email.sh and fix some bugs
9987 gitk: Handle msysGit version during version comparisons
9988 git: browsing paths with spaces when using the start command
9991 gitk: Check git version before using --textconv flag
9994 MinGW: Scan for \r in addition to \n when reading shbang lines
9997 git-submodule: add support for --rebase.
9999 Pierre Habouzit (1):
10000 parse-options: add parse_options_check to validate option specs.
10002 Ralf Wildenhues (1):
10003 configure: test whether -lresolv is needed
10006 parseopt: add OPT_NEGBIT
10007 parseopt: add OPT_NUMBER_CALLBACK
10008 parseopt: add PARSE_OPT_NODASH
10009 grep: remove global variable builtin_grep
10011 grep: make callback functions static
10012 userdiff: add xdiff_clear_find_func()
10013 grep: move context hunk mark handling into show_line()
10014 grep: print context hunk marks between files
10015 grep: handle pre context lines on demand
10016 grep: add option -p/--show-function
10017 grep -p: support user defined regular expressions
10018 grep: simplify -p output
10020 Robin Rosenberg (1):
10021 Disallow '\' in ref names
10024 bash: remove always true if statement from __git_ps1()
10025 Documentation: mention 'git stash pop --index' option explicitly
10026 bash: add support for 'git stash pop --index' option
10029 parse-remote: function to get the tracking branch to be merge
10030 parse-remote: support default reflist in get_remote_merge_branch
10031 parse-remote: remove unused functions
10033 Sitaram Chamarty (1):
10034 allow -t abbreviation for --track in git branch
10036 Steffen Prohaska (1):
10037 MinGW: Teach Makefile to detect msysgit and apply specific settings
10040 bash completion: complete variable names for "git config" with options
10041 format-patch: migrate to parse-options API
10042 parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh's
10043 show-branch: migrate to parse-options API
10044 parse-opts: prepare for OPT_FILENAME
10045 parse-opts: add OPT_FILENAME and transition builtins
10046 t5500: Modernize test style
10047 t9120: don't expect failure with SVN_HTTPD_PORT unset
10048 config.txt: document add.ignore-errors
10049 git-show-branch.txt: document --date-order option
10050 parse-options: make OPT_INTEGER's argh explicit
10051 parse-options: simplify usage argh handling
10052 show-branch: don't use LASTARG_DEFAULT with OPTARG
10053 t4150: test applying with a newline in subject
10054 am: suppress apply errors when using 3-way
10055 git-sh-setup: introduce say() for quiet options
10056 submodule, repack: migrate to git-sh-setup's say()
10057 am, rebase: teach quiet option
10058 stash: teach quiet option
10059 show-ref: migrate to parse-options
10060 completion: add missing config variables
10061 completion: __git_config_get_set_variables() handle values with spaces
10063 Tay Ray Chuan (15):
10064 t5540-http-push: test fetching of loose objects
10065 t5540-http-push: test fetching of packed objects
10066 http-push: send out fetch requests on queue
10067 http-push: fix missing "#ifdef USE_CURL_MULTI" around "is_running_queue"
10068 t5550-http-fetch: test fetching of packed objects
10069 http-push, http-walker: style fixes
10070 http-walker: verify remote packs
10071 http*: copy string returned by sha1_to_hex
10072 http-push: do not SEGV after fetching a bad pack idx file
10073 http*: move common variables and macros to http.[ch]
10074 http: create function end_url_with_slash
10075 http*: add http_get_info_packs
10076 http: use new http API in fetch_index()
10077 http*: add helper methods for fetching packs
10078 http*: add helper methods for fetching objects (loose)
10081 Documentation: teach stash/pop workflow instead of stash/apply
10082 git-svn: let 'dcommit $rev' work on $rev instead of HEAD
10083 Introduce die_errno() that appends strerror(errno) to die()
10084 Convert existing die(..., strerror(errno)) to die_errno()
10085 Use die_errno() instead of die() when checking syscalls
10087 Todd Zullinger (1):
10088 completion: Add --full-diff to log options
10091 send-email: Add config option for sender address
10094 git-svn: Canonicalize svn urls to prevent libsvn assertion
10096 Uwe Kleine-König (2):
10097 more tests for git rev-parse --parse-opt
10098 parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse
10101 git-svn.txt: stop using dash-form of commands.
10102 git-svn.txt: make formatting more consistent.
10103 git-svn.txt: fix fetch flags incorrectly documented as init flags.
10104 git-svn.txt: fix description of fetch flags accepted by clone.
10107 Version v1.6.3.4; changes since v1.6.3.3:
10108 -----------------------------------------
10111 refs.c: release file descriptor on error return
10112 sha1_name.c: avoid unnecessary strbuf_release
10115 git-remote: fix missing .uploadpack usage for show command
10117 Clemens Buchacher (1):
10118 fetch: do not create ref from empty name
10120 Giuseppe Bilotta (1):
10121 gitweb/README: fix AliasMatch in example
10124 t3700-add: add a POSIXPERM prerequisite to a new test
10125 Makefile: git.o depends on library headers
10127 Junio C Hamano (9):
10128 request-pull: really disable pager
10129 checkout -f: deal with a D/F conflict entry correctly
10130 combine-diff.c: fix performance problem when folding common deleted lines
10131 diff --cc: a lost line at the beginning of the file is shown incorrectly
10132 do_one_ref(): null_sha1 check is not about broken ref
10133 SunOS grep does not understand -C<n> nor -e
10134 Fix severe breakage in "git-apply --whitespace=fix"
10135 t8005: Nobody writes Russian in shift_jis
10138 Linus Torvalds (3):
10139 git branch: fix performance problem
10140 git branch: avoid unnecessary object lookups
10141 git branch: clean up detached branch handling
10143 Matthias Andree (1):
10144 Fix export_marks() error handling.
10147 request-pull: really really disable pager
10150 git-submodule documentation: fix foreach example
10153 attr: plug minor memory leak
10156 fread does not return negative on error
10159 Trailing whitespace and no newline fix
10161 Sitaram Chamarty (1):
10162 Documentation: update description of shell aliases
10165 add: allow configurations to be overriden by command line
10166 config.txt: document add.ignore-errors
10168 Thadeu Lima de Souza Cascardo (1):
10169 Makes some cleanup/review in gittutorial
10172 Test git archive --remote
10173 Test grep --and/--or/--not
10176 request-pull: allow ls-remote to notice remote.$nickname.uploadpack
10179 Version v1.6.3.3; changes since v1.6.3.2:
10180 -----------------------------------------
10182 Anders Kaseorg (1):
10183 for-each-ref: Do not lookup objects when they will not be used
10185 Clemens Buchacher (1):
10186 refuse to merge during a merge
10189 use xstrdup, not strdup in ll-merge.c
10191 Johannes Schindelin (1):
10192 import-tars: support symlinks
10195 fetch-pack: close output channel after sideband demultiplexer terminates
10196 diff.c: plug a memory leak in an error path
10198 Junio C Hamano (3):
10199 t3505: fix abuse of test_expect_code
10200 attribute: whitespace set to true detects all errors known to git
10203 Linus Torvalds (1):
10204 Fix big left-shifts of unsigned char
10206 Marco Nelissen (1):
10207 fix handling of iconv configuration options
10210 http.c: fix compiling with libcurl 7.9.2
10212 Michael J Gruber (1):
10213 builtin-remote: Make "remote show" display all urls
10216 git-svn documentation: fix typo in 'rebase vs. pull/merge' section
10218 Nanako Shiraishi (1):
10219 .gitattributes: CR at the end of the line is an error
10222 Documentation: git-send-mail can take rev-list arg to drive format-patch
10223 avoid exponential regex match for java and objc function names
10226 upload-archive: fix infinite loop on Cygwin
10228 Shawn O. Pearce (1):
10229 daemon: Strictly parse the "extra arg" part of the command
10232 git-rerere.txt: grammatical fixups and cleanups
10233 pull, rebase: simplify to use die()
10234 git-show-ref.txt: remove word and make consistent
10237 http*: cleanup slot->local after fclose
10240 Documentation: refer to gitworkflows(7) from tutorial and git(1)
10242 Uwe Kleine-König (1):
10243 rebase--interactive: remote stray closing parenthesis
10246 Version v1.6.3.2; changes since v1.6.3.1:
10247 -----------------------------------------
10250 Introduce an unlink(2) wrapper which gives warning if unlink failed
10251 replace direct calls to unlink(2) with unlink_or_warn
10252 print unlink(2) errno in copy_or_link_directory
10253 Clarify kind of conflict in merge-one-file helper
10254 ls-tree manpage: use "unless" instead of "when ... is not"
10255 ls-tree manpage: output of ls-tree is compatible with update-index
10256 http-push.c::remove_locks(): fix use after free
10258 Charles Bailey (2):
10259 t6023: merge-file fails to output anything for a degenerate merge
10260 Change xdl_merge to generate output even for null merges
10262 Clemens Buchacher (1):
10263 fix segfault showing an empty remote
10266 Fix type-punning issues
10268 Daniel Cordero (1):
10269 builtin-checkout: Don't tell user that HEAD has moved before it has
10271 Dave Olszewski (1):
10272 merge-recursive: never leave index unmerged while recursing
10274 Giuseppe Bilotta (1):
10275 completion: use git rev-parse to detect bare repos
10278 fix GIT_TRACE segfault with shell-quoted aliases
10279 add: don't complain when adding empty project root
10280 for-each-ref: fix segfault in copy_email
10281 lock_ref: inform callers of unavailable ref
10282 fetch: report ref storage DF errors more accurately
10283 fix cat-file usage message and documentation
10286 format-patch let -k override a config-specified format.numbered
10287 pre-commit.sample: don't print incidental SHA1
10289 Johannes Schindelin (2):
10290 Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile
10291 Cope better with a _lot_ of packs
10294 t3701: ensure correctly set up repository after skipped tests
10296 Junio C Hamano (8):
10297 Revert "git-add--interactive: remove hunk coalescing"
10298 completion: fix PS1 display during a merge on detached HEAD
10299 completion: simplify "current branch" in __git_ps1()
10300 completion: enhance "current branch" display
10301 Prepare for 1.6.3.2
10302 Update draft release notes for 1.6.3.2
10303 blame: correctly handle a path that used to be a directory
10306 Linus Torvalds (3):
10307 Avoid unnecessary 'lstat()' calls in 'get_stat_data()'
10308 Teach 'git checkout' to preload the index contents
10309 dir.c: clean up handling of 'path' parameter in read_directory_recursive()
10312 Splitting a hunk that adds a line at the top fails in "add -p"
10314 Michael J Gruber (1):
10315 merge-options.txt: Clarify merge --squash
10317 Nanako Shiraishi (1):
10318 test: checkout shouldn't say that HEAD has moved if it didn't
10321 allow OFS_DELTA objects during a push
10324 grep: fix word-regexp colouring
10325 grep: fix word-regexp at the beginning of lines
10326 grep: fix colouring of matches with zero length
10327 grep: fix empty word-regexp matches
10330 api-parse-options.txt: use 'func' instead of 'funct'
10331 tests: Add tests for missing format-patch long options
10332 completion: add missing options to show-branch and show
10333 show-branch: Fix die message in parse_reflog_param()
10334 commit: -F overrides -t
10335 apply, fmt-merge-msg: use relative filenames
10338 Documentation: teach stash/pop workflow instead of stash/apply
10339 add -i: do not dump patch during application
10342 Turn on USE_ST_TIMESPEC for OpenBSD
10345 Version v1.6.3.1; changes since v1.6.3:
10346 ---------------------------------------
10349 Clarify kind of conflict in merge-one-file helper
10351 Alexander Potashev (1):
10352 Documentation: cloning to empty directory is allowed
10354 Felipe Contreras (1):
10355 git config: clarify --add and --get-color
10357 Junio C Hamano (4):
10358 Start 1.6.3.1 maintenance series.
10359 archive-tar.c: squelch a type mismatch warning
10360 Revert "checkout branch: prime cache-tree fully"
10364 Version v1.6.3; changes since v1.6.3-rc4:
10365 -----------------------------------------
10368 improve error message in config.c
10371 dir.c: Fix two minor grammatical errors in comments
10374 Work around BSD whose typeof(tv.tv_sec) != time_t
10377 t4018-diff-funcname: add cpp xfuncname pattern to syntax test
10378 t8005: use egrep when extended regular expressions are required
10379 t4118: add missing '&&'
10380 t4118: avoid sed invocation on file without terminating newline
10381 t/annotate-tests.sh: avoid passing a non-newline terminated file to sed
10382 t4200: remove two unnecessary lines
10383 t4200: convert sed expression which operates on non-text file to perl
10385 Junio C Hamano (4):
10388 git-clean doc: the command only affects paths under $(cwd)
10391 Nguyễn Thái Ngọc Duy (1):
10392 t4029: use sh instead of bash
10395 honor repack.usedeltabaseoffset when fetching packs
10397 Robin H. Johnson (1):
10398 git-svn: fix a sloppy Getopt::Long usage
10401 completion: add missing configuration variables to _git_config()
10402 completion: add {gui,diff,merge}tool, man, and pager config variables
10403 completion: complete values for help.format
10404 completion: complete values for log.date
10405 completion: complete values for send-email
10406 git-am.txt: add an 'a', say what 'it' is, simplify a sentence
10407 git-am.txt: Use date or value instead of time or timestamp
10408 git-am.txt: reword extra headers in message body
10411 Version v1.6.3-rc4; changes since v1.6.3-rc3:
10412 ---------------------------------------------
10415 git-gui: Update Russian translation
10416 improve error message in config.c
10417 gitk: Add Russian translation
10419 Alexander Gavrilov (3):
10420 git-gui: Fix post-commit status with subject in non-locale encoding
10421 git-gui: Avoid an infinite rescan loop in handle_empty_diff.
10422 git-gui: Support more git version notations.
10425 builtin-merge: fix a typo in an error message
10426 Documentation: fix a grammatical error in api-builtin.txt
10428 Benjamin Kramer (1):
10429 daemon.c: fix segfault on OS X
10431 Christian Stimming (1):
10432 gitk: Mark forgotten string for translation
10434 Daniel A. Steffen (2):
10435 gitk: Fixes for Mac OS X TkAqua
10436 git-gui: Fixes for Mac OS X TkAqua
10439 Makefile: installing git in cygwin 1.7.0
10440 doc: consistently use ASCIIDOC_EXTRA
10442 Felipe Contreras (2):
10443 git config: error when editing a repo config and not being in one
10444 Fix a bunch of pointer declarations (codestyle)
10447 git-gui: Ensure consistent usage of mergetool.keepBackup
10449 Giuseppe Bilotta (1):
10450 gitk: Provide a window icon if possible
10453 Makefile: fix NO_PERL bug with gitweb
10456 git-gui: Fix merge conflict display error when filename contains spaces
10457 git-gui: When calling post-commit hook wrong variable was cleared.
10458 git-gui: run post-checkout hook on checkout
10459 git-gui: run post-checkout hook after clone
10461 Joerg Bornemann (1):
10462 git-gui: fix use of undeclared variable diff_empty_count
10464 Johannes Schindelin (2):
10465 t5701: do not get stuck in empty-push/
10466 Rename core.unreliableHardlinks to core.createObject
10469 prune-packed: advanced progress even for non-existing fan-out directories
10471 Junio C Hamano (3):
10472 diff -c -p: do not die on submodules
10473 merge-recursive: do not die on a conflicting submodule
10476 Linus Torvalds (1):
10477 grep: fix segfault when "git grep '('" is given
10480 Add semicolon to curly brace group in main Makefile
10482 Markus Heidelberg (5):
10483 git-gui: don't hide the Browse button when resizing the repo chooser
10484 git-gui: fix deleting from the context menu with empty selection
10485 git-gui: use `git --html-path` to get the location of installed HTML docs
10486 git-gui (Win): make "Explore Working Copy" more robust
10487 git-gui (Win): make starting via "Git GUI Here" on .git/ possible
10489 Michele Ballabio (2):
10490 gitk: Mark some more strings for translation
10491 gitk: Map KP_Divide to focus the search box
10494 gitk: Handle blobs containing a DOS end-of-file marker
10495 gitk: Remember and restore the window state with the geometry
10496 gitk: Handle external diff tool with spaces in the path
10497 gitk: Avoid crash if closed while reading references
10499 Patrick Welche (1):
10500 NetBSD compilation fix
10502 Paul Mackerras (4):
10503 gitk: Add a way to mark a commit, plus a "find descendant" command
10504 gitk: Add a command to compare two strings of commits
10505 gitk: Make .gitk a hidden file under windows
10506 gitk: Fix compare-commits function when we have local changes
10509 Append ampersand to "Target" of lnk files created by do_cygwin_shortcut
10512 ctype.c: fix typo in comment
10515 git-gui: various French translation fixes
10516 git-gui: minor spelling fix and string factorisation.
10519 SubmittingPatches: itemize and reflect upon well written changes
10522 gitk: Provide a 32x32 window icon based on the git logo
10524 Uwe Kleine-König (1):
10525 parseopt: fix documentation for --keep-dashdash
10528 Version v1.6.3-rc3; changes since v1.6.3-rc2:
10529 ---------------------------------------------
10531 Benjamin Kramer (1):
10532 connect: replace inet_ntop with getnameinfo
10535 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
10536 t7700-repack: repack -a now works properly, expect success from test
10538 Johannes Schindelin (1):
10539 Add an option not to use link(src, dest) && unlink(src) when that is unreliable
10541 Linus Torvalds (1):
10545 progress bar: round to the nearest instead of truncating down
10547 Sitaram Chamarty (1):
10548 Remove obsolete bug warning in man git-update-server-info
10550 Wesley J. Landaker (2):
10551 Documentation: git-clean: fix minor grammatical errors
10552 Documentation: git-clean: make description more readable
10555 Version v1.6.3-rc2; changes since v1.6.3-rc1:
10556 ---------------------------------------------
10559 Wait for git diff to finish in git difftool
10560 Explain seemingly pointless use of system in difftool
10563 t4202-log: extend test coverage of graphing
10564 graph API: fix extra space during pre_commit_line state
10565 graph API: fix a bug in the rendering of octopus merges
10568 Work around ash "alternate value" expansion bug
10570 Bill Pemberton (1):
10571 Add parsing of elm aliases to git-send-email
10573 Dan Loewenherz (1):
10574 Convert to use quiet option when available
10576 Erik Faye-Lund (4):
10577 test-suite: adding a test for fast-export with tag variants
10578 builtin-fast-export.c: turn error into warning
10579 builtin-fast-export.c: fix crash on tagged trees
10580 builtin-fast-export.c: handle nested tags
10582 Frank Lichtenheld (1):
10583 gitcvs-migration: Link to git-cvsimport documentation
10586 gitweb: Fix snapshots requested via PATH_INFO
10589 add-interactive: refactor mode hunk handling
10590 t7800: respect NO_PERL
10593 Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'
10595 Johannes Schindelin (1):
10596 Fix off-by-one in read_tree_recursive
10599 Windows: Work around intermittent failures in mingw_rename
10600 Windows: Skip fstat/lstat optimization in write_entry()
10601 builtin-help: silently tolerate unknown keys
10602 remote.c: do not trigger remote.<name>.<var> codepath for two-level names
10604 Junio C Hamano (8):
10606 read-tree A B: do not corrupt cache-tree
10607 Move prime_cache_tree() to cache-tree.c
10608 read-tree -m A B: prime cache-tree from the switched-to tree
10609 checkout branch: prime cache-tree fully
10610 Revert "stat_tracking_info(): only count real commits"
10611 Makefile: ignore perl/ subdirectory under NO_PERL
10615 Speed up reflog pruning of unreachable commits
10617 Linus Torvalds (1):
10618 Clean up reflog unreachability pruning decision
10620 Markus Heidelberg (1):
10621 grep: don't support "grep.color"-like config options
10624 git add -p: new "quit" command at the prompt.
10625 Update git-add.txt according to the new possibilities of 'git add -p'.
10626 clone: add test for push on an empty clone.
10628 Michael J Gruber (2):
10629 test-lib.sh: Help test_create_repo() find the templates dir
10630 Fix more typos/spelling in comments
10632 Michał Kiedrowicz (3):
10633 tests: test applying criss-cross rename patch
10634 builtin-apply: keep information about files to be deleted
10635 tests: make test-apply-criss-cross-rename more robust
10638 builtin-remote: fix typo in option description
10639 Documentation: fix typos / spelling mistakes
10640 Fix typos / spelling in comments
10642 Nguyễn Thái Ngọc Duy (1):
10643 Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins
10646 test-genrandom: Add newline to usage string
10647 config.txt: add missing format.{subjectprefix,cc,attach} variables
10648 Documentation: use lowercase for shallow and deep threading
10649 git-show-branch.txt: cleanup example description
10650 git-format-patch.txt: general rewordings and cleanups
10651 config.txt: add missing 'the's and make words plural
10652 config.txt: clarify sentences in the configuration and syntax sections
10653 config.txt: Make configuration paragraph more consistent
10655 Wesley J. Landaker (2):
10656 Documentation: git-svn: fix spurious bolding that mangles the output
10657 Documentation: git-svn: fix a grammatical error without awkwardness
10659 Wincent Colaiuta (1):
10660 git add -p: add missing "q" to patch prompt
10663 Version v1.6.3-rc1; changes since v1.6.3-rc0:
10664 ---------------------------------------------
10667 graph API: Added logic for colored edges
10670 shorten_unambiguous_ref(): add strict mode
10671 for-each-ref: utilize core.warnAmbiguousRefs for :short-format
10672 rev-parse: --abbrev-ref option to shorten ref name
10674 David Aguilar (11):
10675 difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
10676 difftool: remove the backup file feature
10677 difftool: use perl built-ins when testing for msys
10678 difftool: add a -y shortcut for --no-prompt
10679 difftool: move 'git-difftool' out of contrib
10680 difftool: add various git-difftool tests
10681 difftool: add support for a difftool.prompt config variable
10682 bash completion: add git-difftool
10683 mergetool: use $( ... ) instead of `backticks`
10684 difftool/mergetool: refactor commands to use git-mergetool--lib
10685 mergetool--lib: simplify API usage by removing more global variables
10688 git-shell: Add 'git-upload-archive' to allowed commands.
10691 Fix misspelled mergetool.keepBackup
10693 Frank Lichtenheld (1):
10694 init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
10697 doc: clarify --no-track option
10698 doc: refer to tracking configuration as "upstream"
10699 doc/checkout: refer to git-branch(1) as appropriate
10700 doc/checkout: split checkout and branch creation in synopsis
10701 docs/checkout: clarify what "non-branch" means
10702 add-interactive: refactor mode hunk handling
10703 doc/gitattributes: clarify location of config text
10706 t1301-shared-repo: fix forced modes test
10708 Junio C Hamano (4):
10709 gitignore git-bisect--helper
10710 unpack-trees: do not muck with attributes when we are not checking out
10711 Describe fixes since 1.6.2.3
10712 Update draft release notes to 1.6.3
10714 Linus Torvalds (3):
10715 Allow users to un-configure rename detection
10716 process_{tree,blob}: show objects without buffering
10717 show_object(): push path_name() call further down
10719 Markus Heidelberg (5):
10720 doc/merge-config: list ecmerge as a built-in merge tool
10721 git-mergetool/difftool: make (g)vimdiff workable under Windows
10722 git-mergetool: add new merge tool TortoiseMerge
10723 doc/git-daemon: add missing arguments to options
10724 doc/git-daemon: add missing arguments to max-connections option
10727 git add -p: new "quit" command at the prompt.
10728 Update git-add.txt according to the new possibilities of 'git add -p'.
10730 Michael J Gruber (1):
10731 remote.c: use shorten_unambiguous_ref
10733 Michał Kiedrowicz (3):
10734 tests: test applying criss-cross rename patch
10735 builtin-apply: keep information about files to be deleted
10736 Documentation: boolean value may be given by on/off
10738 Nanako Shiraishi (1):
10739 git-am: teach git-am to apply a patch to an unborn branch
10741 Nguyễn Thái Ngọc Duy (3):
10742 get_local_heads(): do not return random pointer if there is no head
10743 attr: add GIT_ATTR_INDEX "direction"
10744 archive: do not read .gitattributes in working directory
10747 imap-send: use correct configuration variable in documentation
10749 Pierre Habouzit (1):
10750 hook/update: example of how to prevent branch creation
10753 archive tests: do not use .gitattributes in working directory
10754 archive test: attributes
10756 Sebastian Pipping (1):
10757 difftool/mergetool: add diffuse as merge and diff tool
10759 Thomas Jarosch (1):
10760 Fix buffer overflow in config parser
10763 git-apply: fix option description
10766 Version v1.6.3-rc0; changes since v1.6.2.5:
10767 -------------------------------------------
10770 disable post-checkout test on Cygwin
10771 Produce a nicer output in case of sha1_object_info failures in ls-tree -l
10772 Microoptimize strbuf_cmp
10773 Improve error message about fetch into current branch
10775 Ali Gholami Rudi (2):
10776 builtin-clone.c: make junk_pid static
10777 builtin-clone.c: no need to strdup for setenv
10780 Do not name "repo" struct "remote" in push_http.c
10781 http-push.c: use a faux remote to pass to http_init
10783 Arjen Laarhoven (2):
10784 Clean up use of ANSI color sequences
10785 builtin-branch.c: Rename branch category color names
10788 bash completion: add options for 'git fsck'
10791 git-svn: Add per-svn-remote ignore-paths config
10792 git-svn: Save init/clone --ignore-paths in config
10795 configure: ensure settings from user are also usable in the script
10796 configure: reorganize flow of argument checks
10797 configure: add macros to stash FLAG variables
10798 configure: wrap some library tests with GIT_STASH_FLAGS
10799 configure: asciidoc version test cleanup
10800 configure: make iconv tests aware of user arguments
10801 configure: rework pthread handling to allow for user defined flags
10802 documentation: Makefile accounts for SHELL_PATH setting
10804 Benjamin Kramer (4):
10805 Remove unused function scope local variables
10806 Move local variables to narrower scopes
10807 Remove unused assignments
10808 Fix various dead stores found by the clang static analyzer
10810 Björn Steinbrink (1):
10811 Mailmap: Allow empty email addresses to be mapped
10814 git-svn: speed up blame command
10817 builtin-send-pack.c: avoid empty structure initialization
10819 Brian Gernhardt (2):
10820 Create USE_ST_TIMESPEC and turn it on for Darwin
10821 Makefile: Set compiler switch for USE_NSEC
10823 Carlos Manuel Duclos Vergara (1):
10824 git-archive: add --output=<file> to send output to a file
10827 config: test for --replace-all with one argument and fix documentation.
10829 Chris Johnsen (13):
10830 git-push.txt: describe how to default to pushing only current branch
10831 Documentation: remove extra quoting/emphasis around literal texts
10832 Documentation/Makefile: make most operations "quiet"
10833 Documentation/Makefile: break up texi pipeline
10834 Documentation: move callouts.xsl to manpage-{base,normal}.xsl
10835 Documentation: use parametrized manpage-base.xsl with manpage-{1.72,normal}.xsl
10836 Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff
10837 Documentation: move quieting params into manpage-base.xsl
10838 Documentation: move "spurious .sp" code into manpage-base.xsl
10839 Documentation: asciidoc.conf: always use <literallayout> for [blocktext]
10840 Documentation: asciidoc.conf: fix verse block with block titles
10841 Documentation: option to render literal text as bold for manpages
10842 Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set
10844 Christian Couder (24):
10845 rev-list: estimate number of bisection step left
10846 log-tree: fix patch filename computation in "git format-patch"
10847 quote: implement "sq_dequote_many" to unwrap many args in one string
10848 quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array
10849 refs: add "for_each_ref_in" function to refactor "for_each_*_ref" functions
10850 rev-list: make "bisect_list" variable local to "cmd_rev_list"
10851 rev-list: move bisect related code into its own file
10852 rev-list: move code to show bisect vars into its own function
10853 rev-list: make "show_bisect_vars" non static
10854 rev-list: pass "revs" to "show_bisect_vars"
10855 sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1
10856 patch-ids: use the new generic "sha1_pos" function to lookup sha1
10857 bisect: improve error message when branch checkout fails
10858 rev-list: call new "filter_skip" function
10859 bisect: use the new generic "sha1_pos" function to lookup sha1
10860 bisect--helper: implement "git bisect--helper"
10861 bisect: implement "read_bisect_paths" to read paths in "$GIT_DIR/BISECT_NAMES"
10862 bisect: use "bisect--helper" and remove "filter_skipped" function
10863 t6030: test bisecting with paths
10864 rev-list: pass "int flags" as last argument of "show_bisect_vars"
10865 bisect--helper: string output variables together with "&&"
10866 list-objects: add "void *data" parameter to show functions
10867 rev-list: remove last static vars used in "show_commit"
10868 rev-list: add "int bisect_show_flags" in "struct rev_list_info"
10871 Update delta compression message to be less misleading
10873 Daniel Barkalow (8):
10874 Make clone parse the default refspec with the normal code
10875 Use a single function to match names against patterns
10876 Use the matching function to generate the match results
10877 Keep '*' in pattern refspecs
10878 Support '*' in the middle of a refspec
10879 Use a common function to get the pretty name of refs
10880 Move push matching and reporting logic into transport.c
10881 Include log_config module in apache.conf
10884 contrib/difftool: use a separate config namespace for difftool commands
10887 add -i: revisit hunk on editor failure
10890 git-filter-branch: avoid collisions with variables in eval'ed commands
10891 Correct missing SP characters in grammar comment at top of fast-import.c
10892 fast-export: Avoid dropping files from commits
10895 config.txt: Describe special 'none' handling in core.gitProxy.
10898 git-svn: fix ls-tree usage with dash-prefixed paths
10900 Erik Faye-Lund (5):
10901 connect.c: remove a few globals by using git_config callback data
10902 test-suite: adding a test for fast-export with tag variants
10903 builtin-fast-export.c: turn error into warning
10904 builtin-fast-export.c: fix crash on tagged trees
10905 builtin-fast-export.c: handle nested tags
10907 Eugene Letuchy (1):
10908 Make git blame's date output format configurable, like git log
10910 Felipe Contreras (14):
10911 config: Add new option to open an editor.
10912 git config: codestyle cleanups
10913 git_config(): not having a per-repo config file is not an error
10914 git config: trivial rename in preparation for parseopt
10915 git config: reorganize get_color*
10916 git config: reorganize to use parseopt
10917 git config: don't allow multiple config file locations
10918 git config: don't allow multiple variable types
10919 git config: don't allow extra arguments for -e or -l.
10920 git config: don't allow --get-color* and variable type
10921 Add tests for git log --pretty, --format and --oneline.
10922 user-manual: remove some git-foo usage
10923 docbook: change css style
10924 user-manual: the name of the hash function is SHA-1, not sha1
10926 Finn Arne Gangstad (7):
10927 New config push.default to decide default behavior for push
10928 Display warning for default git push with no push.default config
10929 builtin-remote.c: Split out prune_remote as a separate function.
10930 git remote update: New option --prune
10931 git remote update: Report error for non-existing groups
10932 remote: New function remote_is_configured()
10933 git remote update: Fallback to remote if group does not exist
10935 Giuseppe Bilotta (1):
10936 import-tars: separate author from committer
10939 Add warning about known issues to documentation of cvsimport
10940 Cleanup warning about known issues in cvsimport documentation
10941 Add configuration variable for sign-off to format-patch
10944 MinGW: implement mmap
10947 git-svn: add fetch --parent option
10950 builtin-branch: improve output when displaying remote branches
10951 move duplicated get_local_heads() to remote.c
10952 move duplicated ref_newer() to remote.c
10953 move locate_head() to remote.c
10954 remote: simplify guess_remote_head()
10955 remote: make copy_ref() perform a deep copy
10956 remote: let guess_remote_head() optionally return all matches
10957 remote: make match_refs() copy src ref before assigning to peer_ref
10958 remote: make match_refs() not short-circuit
10959 string-list: new for_each_string_list() function
10960 builtin-remote: refactor duplicated cleanup code
10961 builtin-remote: remove unused code in get_ref_states
10962 builtin-remote: rename variables and eliminate redundant function call
10963 builtin-remote: make get_remote_ref_states() always populate states.tracked
10964 builtin-remote: fix two inconsistencies in the output of "show <remote>"
10965 builtin-remote: teach show to display remote HEAD
10966 builtin-remote: add set-head subcommand
10967 builtin-remote: new show output style
10968 builtin-remote: new show output style for push refspecs
10969 send-email: add --confirm option and configuration setting
10970 bash completion: fix completion issues with fetch, pull, and push
10971 bash completion: refactor --strategy completion
10972 bash completion: teach fetch, pull, and push to complete their options
10973 send-email: refactor and ensure prompting doesn't loop forever
10974 send-email: add tests for refactored prompting
10975 send-email: don't attempt to prompt if tty is closed
10976 send-email: ask_default should apply to all emails, not just the first
10977 send-email: correct two tests which were going interactive
10978 send-email: ensure quoted addresses are rfc2047 encoded
10979 send-email: fix nasty bug in ask() function
10982 valgrind: ignore ldso and more libz errors
10983 branch: clean up repeated strlen
10984 add basic branch display tests
10985 test scripts: refactor start_httpd helper
10986 add basic http clone/fetch tests
10987 refactor find_ref_by_name() to accept const list
10988 remote: make guess_remote_head() use exact HEAD lookup if it is available
10989 clone: run post-checkout hook when checking out
10990 improve missing repository error message
10991 config: set help text for --bool-or-int
10992 t3000: use test_cmp instead of diff
10993 ls-files: fix broken --no-empty-directory
10994 ls-files: require worktree when --deleted is given
10995 make oneline reflog dates more consistent with multiline format
10996 remote: improve sorting of "configure for git push" list
10997 Makefile: turn on USE_ST_TIMESPEC for FreeBSD
10998 t0060: fix whitespace in "wc -c" invocation
10999 tests: remove exit after test_done call
11000 for-each-ref: refactor get_short_ref function
11001 for-each-ref: refactor refname handling
11002 for-each-ref: add "upstream" format field
11003 make get_short_ref a public function
11004 branch: show upstream branch when double verbose
11005 Makefile: allow building without perl
11006 tests: skip perl tests if NO_PERL is defined
11007 add tests for remote groups
11010 githooks documentation: post-checkout hook is also called after clone
11013 Enable setting attach as the default in .gitconfig for git-format-patch.
11014 imap.preformattedHTML to tell Thunderbird to send non-flowed text
11016 Johannes Schindelin (23):
11017 Add valgrind support in test scripts
11018 Valgrind support: check for more than just programming errors
11019 test-lib.sh: optionally output to test-results/$TEST.out, too
11020 t/Makefile: provide a 'valgrind' target
11021 Add a script to coalesce the valgrind outputs
11022 Tests: let --valgrind imply --verbose and --tee
11023 test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
11024 valgrind: do not require valgrind 3.4.0 or newer
11025 Avoid segfault with 'git branch' when the HEAD is detached
11026 Turn the flags in struct dir_struct into a single variable
11027 git config: trivial cleanup for editor action
11028 rebase -i: avoid 'git reset' when possible
11029 MinGW: 64-bit file offsets
11030 Brown paper bag fix for MinGW 64-bit stat
11031 Add an (optional, since expensive) test for >2gb clones
11032 MinGW: fix diff --no-index /dev/null ...
11033 winansi: support ESC [ K (erase in line)
11034 test: do not LoadModule log_config_module unconditionally
11035 test-lib: write test results to test-results/<basename>-<pid>
11036 gc --aggressive: make it really aggressive
11037 t7300: fix clean up on Windows
11038 Guard a few Makefile variables against user environments
11039 git-svn: always initialize with core.autocrlf=false
11041 Johannes Sixt (30):
11042 recv_sideband: Bands #2 and #3 always go to stderr
11043 test-suite: Make test script numbers unique
11044 t9400, t9401: Do not force hard-linked clone
11045 test suite: Use 'say' to say something instead of 'test_expect_success'
11046 Call 'say' outside test_expect_success
11047 test-lib: Replace uses of $(expr ...) by POSIX shell features.
11048 test-lib: Simplify test counting.
11049 test-lib: Introduce test_chmod and use it instead of update-index --chmod
11050 t2200, t7004: Avoid glob pattern that also matches files
11051 t5300, t5302, t5303: Do not use /dev/zero
11052 t5602: Work around path mangling on MSYS
11053 test-lib: Work around incompatible sort and find on Windows
11054 test-lib: Work around missing sum on Windows
11055 Tests on Windows: $(pwd) must return Windows-style paths
11056 t0050: Check whether git init detected symbolic link support correctly
11057 test-lib: Infrastructure to test and check for prerequisites
11058 t3600: Use test prerequisite tags
11059 Skip tests that fail if the executable bit is not handled by the filesystem
11060 t5302: Use prerequisite tags to skip 64-bit offset tests
11061 t9100, t9129: Use prerequisite tags for UTF-8 tests
11062 Use prerequisite tags to skip tests that depend on symbolic links
11063 t0060: Fix tests on Windows
11064 Skip tests that require a filesystem that obeys POSIX permissions
11065 t3700: Skip a test with backslashes in pathspec
11066 Use prerequisites to skip tests that need unzip
11067 t7004: Use prerequisite tags to skip tests that need gpg
11068 t5503: GIT_DEBUG_SEND_PACK is not supported on MinGW
11069 MinGW: Quote arguments for subprocesses that contain a single-quote
11070 t7005-editor: Use $SHELL_PATH in the editor scripts
11071 t7502-commit: Skip SIGTERM test on Windows
11074 Modify description file to say what this file is
11075 Google has renamed the imap folder
11076 Improve error message for git-filter-branch
11077 Documentation - More examples for git bisect
11079 Junio C Hamano (28):
11080 git-blame: refactor code to emit "porcelain format" output
11081 blame: show "previous" information in --porcelain/--incremental format
11082 Make git-clone respect branch.autosetuprebase
11083 Draft release notes: Carry forward the warning for behaviour changes
11084 Update draft release notes to 1.6.3
11085 builtin-remote.c: no "commented out" code, please
11086 Not all systems use st_[cm]tim field for ns resolution file timestamp
11087 grep: cast printf %.*s "precision" argument explicitly to int
11088 http.c: style cleanups
11089 Improve "git branch --tracking" output
11090 http_init(): Fix config file parsing
11091 http authentication via prompts
11092 Update release notes to 1.6.3
11093 http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient versions of cURL
11094 Read attributes from the index that is being checked out
11095 Update draft release notes to 1.6.3
11096 http tests: Darwin is not that special
11097 Rename interpret/substitute nth_last_branch functions
11098 strbuf_branchname(): a wrapper for branch name shorthands
11099 check-ref-format --branch: give Porcelain a way to grok branch shorthand
11100 Fix branch -m @{-1} newname
11101 strbuf_check_branch_ref(): a helper to check a refname for a branch
11102 check_ref_format(): tighten refname rules
11103 Update draft release notes to 1.6.3
11104 Update draft release notes to 1.6.3
11105 sha1-lookup: fix up the assertion message
11106 Update draft release notes to 1.6.3
11110 Speed up reflog pruning of unreachable commits
11113 Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking
11114 Fix neglect of diff_setup()/diff_setup_done() symmetry.
11117 builtin-push.c: Fix typo: "anythig" -> "anything"
11119 Kevin McConnell (1):
11120 Add --staged to bash completion for git diff
11122 Kjetil Barvik (18):
11123 lstat_cache(): small cleanup and optimisation
11124 lstat_cache(): generalise longest_match_lstat_cache()
11125 lstat_cache(): swap func(length, string) into func(string, length)
11126 unlink_entry(): introduce schedule_dir_for_removal()
11127 create_directories(): remove some memcpy() and strchr() calls
11128 write_entry(): cleanup of some duplicated code
11129 write_entry(): use fstat() instead of lstat() when file is open
11130 show_patch_diff(): remove a call to fstat()
11131 lstat_cache(): print a warning if doing ping-pong between cache types
11132 check_updates(): effective removal of cache entries marked CE_REMOVE
11133 fix compile error when USE_NSEC is defined
11134 make USE_NSEC work as expected
11135 verify_uptodate(): add ce_uptodate(ce) test
11136 write_index(): update index_state->timestamp after flushing to disk
11137 stat_tracking_info(): only count real commits
11138 Record ns-timestamps if possible, but do not use it without USE_NSEC
11139 checkout bugfix: use stat.mtime instead of stat.ctime in two places
11140 Revert "lstat_cache(): print a warning if doing ping-pong between cache types"
11142 Kristian Amlie (1):
11143 Add a test for checking whether gitattributes is honored by checkout.
11145 Linus Torvalds (2):
11146 Clean up reflog unreachability pruning decision
11147 Allow users to un-configure rename detection
11149 Marius Storm-Olsen (2):
11150 Add bare repository indicator for __git_ps1
11151 Fixup: Add bare repository indicator for __git_ps1
11153 Markus Heidelberg (1):
11154 add --html-path to get the location of installed HTML docs
11156 Martin Storsjö (1):
11157 Allow curl to rewind the read buffers
11160 git-send-email.txt: clarify which options take an argument.
11161 git-rev-list.txt: make ascii markup uniform with other pages.
11163 Michael Hendricks (1):
11164 format-patch: add arbitrary email headers
11166 Michael J Gruber (6):
11167 Typo and language fixes for git-checkout.txt
11168 test-lib.sh: Test for presence of git-init in the right path.
11169 test-lib.sh: Allow running the test suite against installed git
11170 git-branch.txt: document -f correctly
11171 Test for local branches being followed with --track
11172 Make local branches behave like remote branches when --tracked
11175 git-svn: support intermediate paths when matching tags/branches
11177 Michele Ballabio (6):
11178 apply: consistent spelling of "don't"
11179 apply: hide unused options from short help
11180 git log: avoid segfault with --all-match
11181 document --force-rebase
11182 rebase: add options passed to git-am
11183 rebase: fix typo (force_rebas -> force-rebas)
11186 Replace ",<,>,& with their respective XML entities in DAV requests
11189 parse-opt: migrate builtin-ls-files.
11190 Tests: use test_cmp instead of diff where possible
11191 http-push: using error() and warning() as appropriate
11192 builtin-apply: use warning() instead of fprintf(stderr, "warning: ")
11193 builtin-checkout: use warning() instead of fprintf(stderr, "warning: ")
11194 builtin-fetch-pack: use warning() instead of fprintf(stderr, "warning: ")
11195 builtin-init-db: use warning() instead of fprintf(stderr, "warning: ")
11196 builtin-rm: use warning() instead of fprintf(stderr, "warning: ")
11197 builtin-show-branch: use warning() instead of fprintf(stderr, "warning: ")
11198 builtin-show-ref: use warning() instead of fprintf(stderr, "warning: ")
11199 refs: use warning() instead of fprintf(stderr, "warning: ")
11201 Nanako Shiraishi (4):
11202 Add --format that is a synonym to --pretty
11203 Give short-hands to --pretty=tformat:%formatstring
11204 Add --oneline that is a synonym to "--pretty=oneline --abbrev-commit"
11205 Documentation/git.txt: GIT 1.6.2.2 has been out for a while
11208 format-patch: Respect --quiet option
11210 Nguyễn Thái Ngọc Duy (1):
11211 grep: prefer builtin over external one when coloring results
11214 git-p4: remove tabs from usermap file
11217 MinGW: a helper function that translates Win32 API error codes
11218 MinGW: a hardlink implementation
11220 Ramsay Allan Jones (1):
11221 git-instaweb: fix lighttpd configuration on cygwin
11224 grep: micro-optimize hit collection for AND nodes
11225 grep: remove grep_opt argument from match_expr_eval()
11226 grep: add pmatch and eflags arguments to match_one_pattern()
11227 grep: color patterns in output
11228 grep: add support for coloring with external greps
11229 parseopt: add PARSE_OPT_KEEP_UNKNOWN
11230 parseopt: add PARSE_OPT_NO_INTERNAL_HELP
11231 parseopt: make usage optional
11232 archive: use parseopt for local-only options
11233 parseopt: document KEEP_ARGV0, KEEP_UNKNOWN, NO_INTERNAL_HELP
11234 parseopt: prevent KEEP_UNKNOWN and STOP_AT_NON_OPTION from being used together
11235 pickaxe: count regex matches only once
11238 rerere: remove duplicated functions
11241 Documentation: enhance branch.<name>.{remote,merge}
11242 Documentation: push.default applies to all remotes
11243 Documentation: branch.*.merge can also affect 'git-push'
11244 Documentation: Introduce "upstream branch"
11246 Shawn O. Pearce (1):
11247 Don't permit ref/branch names to end with ".lock"
11250 git-svn: don't output git commits in quiet mode
11251 git-svn: add a double quiet option to hide git commits
11254 git-send-email.txt: describe --compose better
11255 pretty.c: add %f format specifier to format_commit_message()
11256 format-patch: construct patch filename in one function
11257 format-patch: pass a commit to reopen_stdout()
11258 format-patch: move get_patch_filename() into log-tree
11259 format-patch: --attach/inline uses filename instead of SHA1
11260 format-patch: --numbered-files and --stdout aren't mutually exclusive
11261 completion: add --annotate option to send-email
11262 completion: add --cc and --no-attachment option to format-patch
11263 completion: add --thread=deep/shallow to format-patch
11264 format_sanitized_subject: Don't trim past initial length of strbuf
11266 Sverre Rabbelier (1):
11267 Teach rebase to rebase even if upstream is up to date
11270 http.c: use strbuf API in quote_ref_url
11273 completion: For consistency, change "git rev-parse" to __gitdir calls
11274 completion: Use consistent if [...] convention, not "test"
11275 completion: Better __git_ps1 support when not in working directory
11276 completion: More fixes to prevent unbound variable errors
11279 bash completion: add --format= and --oneline options for "git log"
11282 format-patch: threading test reactivation
11283 Support coverage testing with GCC/gcov
11284 Test that diff can read from stdin
11285 Test diff --dirstat functionality
11287 Test fsck a bit harder
11288 Test log --decorate
11289 Test rev-list --parents/--children
11291 format-patch: track several references
11292 format-patch: thread as reply to cover letter even with in-reply-to
11293 format-patch: support deep threading
11294 Documentation: filter-branch: show --ignore-unmatch in main index-filter example
11296 Todd Zullinger (1):
11297 bash completion: Update 'git am' options
11299 Tor Arne Vestbø (2):
11300 git-rebase: Add --stat and --no-stat for producing diffstat on rebase
11301 git-pull: Allow --stat and --no-stat to be used with --rebase
11303 Wesley J. Landaker (1):
11304 Documentation: git-svn: fix trunk/fetch svn-remote key typo
11306 Wincent Colaiuta (2):
11307 Grammar fixes to "merge" and "patch-id" docs
11308 Grammar fix for "git merge" man page
11311 Version v1.6.2.5; changes since v1.6.2.4:
11312 -----------------------------------------
11315 builtin-merge: fix a typo in an error message
11316 Documentation: fix a grammatical error in api-builtin.txt
11318 Frank Lichtenheld (1):
11319 gitcvs-migration: Link to git-cvsimport documentation
11321 Johannes Schindelin (1):
11322 Fix off-by-one in read_tree_recursive
11324 Junio C Hamano (7):
11325 read-tree A B: do not corrupt cache-tree
11326 Move prime_cache_tree() to cache-tree.c
11327 read-tree -m A B: prime cache-tree from the switched-to tree
11328 checkout branch: prime cache-tree fully
11329 diff -c -p: do not die on submodules
11333 Linus Torvalds (3):
11334 process_{tree,blob}: show objects without buffering
11335 show_object(): push path_name() call further down
11336 grep: fix segfault when "git grep '('" is given
11338 Michał Kiedrowicz (3):
11339 tests: test applying criss-cross rename patch
11340 builtin-apply: keep information about files to be deleted
11341 tests: make test-apply-criss-cross-rename more robust
11344 honor repack.usedeltabaseoffset when fetching packs
11347 test-genrandom: Add newline to usage string
11349 Wincent Colaiuta (1):
11350 git add -p: add missing "q" to patch prompt
11353 Version v1.6.2.4; changes since v1.6.2.3:
11354 -----------------------------------------
11356 Björn Steinbrink (1):
11357 tree_entry_interesting: a pathspec only matches at directory boundary
11359 Clemens Buchacher (3):
11360 add tests for merging with submodules
11361 update cache for conflicting submodule entries
11362 simplify output of conflicting merge
11364 Erik Faye-Lund (4):
11365 test-suite: adding a test for fast-export with tag variants
11366 builtin-fast-export.c: turn error into warning
11367 builtin-fast-export.c: fix crash on tagged trees
11368 builtin-fast-export.c: handle nested tags
11370 Frank Lichtenheld (1):
11371 init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
11374 doc/gitattributes: clarify location of config text
11375 add-interactive: refactor mode hunk handling
11378 Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'
11380 Johannes Schindelin (1):
11381 Fix 'git checkout <submodule>' to update the index
11384 t1301-shared-repo: fix forced modes test
11386 Junio C Hamano (3):
11387 match_tree_entry(): a pathspec only matches at directory boundaries
11388 Describe fixes since 1.6.2.3
11392 Speed up reflog pruning of unreachable commits
11394 Linus Torvalds (1):
11395 Clean up reflog unreachability pruning decision
11397 Markus Heidelberg (2):
11398 doc/git-daemon: add missing arguments to options
11399 doc/git-daemon: add missing arguments to max-connections option
11402 git add -p: new "quit" command at the prompt.
11403 Update git-add.txt according to the new possibilities of 'git add -p'.
11405 Nguyễn Thái Ngọc Duy (1):
11406 Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins
11409 imap-send: use correct configuration variable in documentation
11411 Thomas Jarosch (1):
11412 Fix buffer overflow in config parser
11415 git-apply: fix option description
11418 Version v1.6.2.3; changes since v1.6.2.2:
11419 -----------------------------------------
11421 Björn Steinbrink (1):
11422 process_{tree,blob}: Remove useless xstrdup calls
11425 t7700-repack: add two new tests demonstrating repacking flaws
11426 git-repack.sh: don't use --kept-pack-only option to pack-objects
11427 pack-objects: only repack or loosen objects residing in "local" packs
11428 Remove --kept-pack-only option and associated infrastructure
11429 t7700: demonstrate repack flaw which may loosen objects unnecessarily
11430 pack-objects: don't loosen objects available in alternate or kept packs
11433 git-repack: use non-dashed update-server-info
11435 Daniel Cheng (aka SDiZ) (1):
11436 State the effect of filter-branch on graft explicitly
11439 Change double quotes to single quotes in message
11442 Documentation: clarify .gitattributes search
11445 t1301: loosen test for forced modes
11446 commit: abort commit if interactive add failed
11449 Move chmod(foo, 0444) into move_temp_to_file()
11452 git submodule: fix usage line
11454 Junio C Hamano (12):
11455 git-repack: resist stray environment variable
11456 has_sha1_pack(): refactor "pretend these packs do not exist" interface
11457 has_sha1_kept_pack(): take "struct rev_info"
11458 Consolidate ignore_packed logic more
11459 Simplify is_kept_pack()
11460 is_kept_pack(): final clean-up
11461 diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged
11462 "core.sharedrepository = 0mode" should set, not loosen
11463 move_temp_to_file(): do not forget to chmod() in "Coda hack" codepath
11464 set_shared_perm(): sometimes we know what the final mode bits should look like
11465 Start 1.6.2.3 preparation
11468 Linus Torvalds (1):
11469 process_{tree,blob}: Remove useless xstrdup calls
11471 Markus Heidelberg (1):
11472 doc/git-pack-refs: fix two grammar issues
11475 git-checkout.txt: fix incorrect statement about HEAD and index
11476 git-checkout.txt: clarify that <branch> applies when no path is given.
11477 git-pull.sh: better warning message for "git pull" on detached head.
11480 Version v1.6.2.2; changes since v1.6.2.1:
11481 -----------------------------------------
11484 Documentation: update graph api example.
11487 git-branch: display "was sha1" on branch deletion rather than just "sha1"
11489 Carlo Marcelo Arenas Belon (1):
11490 documentation: update cvsimport description of "-r" for recent clone
11492 Daniel Barkalow (1):
11493 Give error when no remote is configured
11495 Daniel Cheng (aka SDiZ) (1):
11496 Fix bash completion in path with spaces
11499 everyday: use the dashless form of git-init
11501 David J. Mellor (12):
11502 Documentation: minor grammatical fixes in git-archive.txt.
11503 Documentation: reword the "Description" section of git-bisect.txt.
11504 Documentation: minor grammatical fixes in git-blame.txt.
11505 Documentation: minor grammatical fixes in git-branch.txt.
11506 Documentation: reworded the "Description" section of git-bisect.txt.
11507 Documentation: reword example text in git-bisect.txt.
11508 Documentation: remove some uses of the passive voice in git-bisect.txt
11509 Documentation: minor grammatical fixes and rewording in git-bundle.txt
11510 Documentation: minor grammatical fixes in git-cat-file.txt
11511 Documentation: minor grammatical fixes in git-check-attr.txt
11512 Documentation: minor grammatical fix in git-check-ref-format.txt
11513 Documentation: Remove spurious uses of "you" in git-bisect.txt.
11516 test-lib: Clean up comments and Makefile.
11519 git-svn: fix ls-tree usage with dash-prefixed paths
11522 Documentation: Remove an odd "instead"
11525 doc: clarify how -S works
11526 ls-files: require worktree when --deleted is given
11527 fix portability problem with IS_RUN_COMMAND_ERR
11529 Johannes Schindelin (4):
11530 rsync transport: allow local paths, and fix tests
11531 Smudge the files fed to external diff and textconv
11532 import-zips: fix thinko
11533 mailmap: resurrect lower-casing of email addresses
11536 Propagate --exec-path setting to external commands via GIT_EXEC_PATH
11537 diff --no-index: Do not generate patch output if other output is requested
11539 Junio C Hamano (6):
11540 read-tree A B C: do not create a bogus index and do not segfault
11541 Remove total confusion from git-fetch and git-push
11542 blame: read custom grafts given by -S before calling setup_revisions()
11543 Update draft release notes to 1.6.2.2
11544 Update draft release notes to 1.6.2.2
11547 Linus Torvalds (1):
11548 close_sha1_file(): make it easier to diagnose errors
11550 Michael J Gruber (2):
11551 git submodule: Add test cases for git submodule add
11552 git submodule: Fix adding of submodules at paths with ./, .. and //
11554 Nico -telmich- Schottelius (1):
11555 git-tag(1): add hint about commit messages
11558 avoid possible overflow in delta size filtering computation
11561 diffcore-pickaxe: use memmem()
11562 optimize compat/ memmem()
11563 pickaxe: count regex matches only once
11565 Shawn O. Pearce (1):
11566 Increase the size of the die/warning buffer to avoid truncation
11569 format-patch: --numbered-files and --stdout aren't mutually exclusive
11572 send-email: respect in-reply-to regardless of threading
11573 send-email: test --no-thread --in-reply-to combination
11574 Documentation: format-patch --root clarifications
11575 bash completion: only show 'log --merge' if merging
11578 Version v1.6.2.1; changes since v1.6.2:
11579 ---------------------------------------
11582 builtin-revert.c: release index lock when cherry-picking an empty commit
11584 Christian Couder (1):
11585 Documentation: fix badly indented paragraphs in "--bisect-all" description
11588 Ensure proper setup of git_dir for git-hash-object
11590 Finn Arne Gangstad (1):
11591 Support "\" in non-wildcard exclusion entries
11594 send-email: allow send-email to run outside a repo
11595 send-email: handle multiple Cc addresses when reading mbox message
11596 send-email: --suppress-cc improvements
11597 send-email: don't create temporary compose file until it is needed
11600 never fallback relative times to absolute
11601 t1300: use test_must_fail as appropriate
11602 document config --bool-or-int
11605 Make the 'lock file' exists error more informative
11607 Junio C Hamano (4):
11608 git-add -i/-p: learn to unwrap C-quoted paths
11609 Beginning of 1.6.2 maintenance track
11610 Update draft release notes for 1.6.2.1
11614 cleanup: add isascii()
11617 Version v1.6.2; changes since v1.6.2-rc2:
11618 -----------------------------------------
11621 git-svn - return original format_svn_date semantics
11623 Christian Couder (2):
11624 bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
11625 bisect: fix another instance of eval'ed string
11628 added missing backtick in git-apply.txt
11630 David J. Mellor (4):
11631 Documentation: minor grammatical fixes.
11632 Documentation: minor grammatical fixes.
11633 Documentation: minor grammatical fixes.
11634 Documentation: minor grammatical fixes.
11637 git-svn: disable broken symlink workaround by default
11640 t5540-http-push.sh: avoid non-portable grep -P
11643 t3400-rebase: Move detached HEAD check earlier
11645 Junio C Hamano (2):
11646 git-am: make --abort less dangerous
11649 Michael J Gruber (1):
11650 git-am: Keep index in case of abort with dirty index
11653 Fix odb_mkstemp() on AIX
11654 Documentation: Typos / spelling fixes in RelNotes
11655 Documentation: Expand a couple of abbreviations
11656 Documentation: Typo / spelling / formatting fixes
11658 Paul Mackerras (1):
11659 gitk: Fix possible infinite loop and display corruption
11662 Documentation/git-archive.txt: Note attributes
11664 Todd Zullinger (1):
11665 git-rebase: Update --whitespace documentation
11668 Version v1.6.2-rc2; changes since v1.6.2-rc1:
11669 ---------------------------------------------
11671 Abhijit Menon-Sen (1):
11672 Convert git-* invocations to "git *" in the svnimport example.
11674 Alexandre Julliard (3):
11675 git.el: Make sure that file lists are sorted as they are created.
11676 git.el: Improve the confirmation message on remove and revert.
11677 Add a README in the contrib/emacs directory.
11680 trace: Fixed a minor typo in an error message.
11683 git-svn fix to avoid using strftime %z
11685 Brian Gernhardt (1):
11686 git-svn: Create leading directories in create-ignore
11688 Christian Couder (1):
11689 README: fix path to "gitcvs-migration.txt" and be more consistent
11692 git-svn: fix delete+add branch tracking with empty files
11694 Felipe Contreras (2):
11695 git add: trivial codestyle cleanup
11696 sha1_file.c: fix typo
11699 Documentation/git-push: --all, --mirror, --tags can not be combined
11700 Install builtins with the user and group of the installing personality
11701 git-quiltimport: preserve standard input to be able to read user input
11703 Giuseppe Bilotta (1):
11704 gitweb: fix wrong base URL when non-root DirectoryIndex
11707 disallow providing multiple upstream branches to rebase, pull --rebase
11708 Allow HTTP tests to run on Darwin
11710 Johannes Schindelin (2):
11711 Introduce the function strip_path_suffix()
11712 system_path(): simplify using strip_path_suffix(), and add suffix "git"
11715 gitattributes.txt: Path matching rules are explained in gitignore.txt
11717 Junio C Hamano (4):
11718 git-svn: fix parsing of timestamp obtained from svn
11719 tests: fix "export var=val"
11720 Make sure objects/pack exists before creating a new pack
11723 Lars Noschinski (1):
11724 filter-branch -d: Export GIT_DIR earlier
11726 Linus Torvalds (1):
11727 Support 'raw' date format
11729 Marc Branchaud (1):
11730 Docs: Expand explanation of the use of + in git push refspecs.
11732 Marcel M. Cary (2):
11733 gitweb: Fix warnings with override permitted but no repo override
11734 gitweb: Hyperlink multiple git hashes on the same commit message line
11737 Document git blame --reverse.
11738 More friendly message when locking the index fails.
11740 Michael J Gruber (1):
11741 Fix typo in contrib/examples/git-svnimport.txt
11744 Skip timestamp differences for diff --no-index
11747 git-p4: avoid syncing duplicate changes
11749 Peter Oberndorfer (1):
11750 git-svn: read the dcommit url from the config file on a per remote basis
11753 bash: add missing 'git merge' options
11754 bash: update 'git svn' options
11757 bash completion: refactor common log, shortlog and gitk options
11758 bash completion: only show 'log --merge' if merging
11760 Todd Zullinger (1):
11761 Documentation: Note file formats send-email accepts
11764 Version v1.6.2-rc1; changes since v1.6.2-rc0:
11765 ---------------------------------------------
11767 Alexandre Julliard (1):
11768 Describe notable git.el changes in the release notes
11770 Anton Gyllenberg (1):
11771 test case for regression caused by git-svn empty symlink fix
11773 Christian Couder (1):
11774 rev-list: fix showing distance when using --bisect-all
11777 git-svn: Print revision while searching for earliest use of path
11780 git-svn: Fix for rewriteRoot URL containing username.
11783 fast-export: ensure we traverse commits in topological order
11786 filter-branch: Add more error-handling
11789 git-svn: allow disabling expensive broken symlink checks
11790 git-svn: fix broken symlink workaround when switching branches
11793 submodule: add --no-fetch parameter to update command
11796 Add 'rm -f' equivalent to 'git rm' example of filter-branch --index-filter
11798 Jakub Narebski (1):
11799 gitweb: Better regexp for SHA-1 committag match
11802 symbolic-ref: allow refs/<whatever> in HEAD
11805 Update documentation to add further information about using Thunderbird with git-imap-send.
11807 Johannes Schindelin (4):
11808 Let ls-files strip trailing slashes in submodules' paths
11809 submodule: warn about non-submodules
11810 Add two extra tests for git rebase
11811 gc: make --prune useful again by accepting an optional parameter
11814 Make test-path-utils more robust against incorrect use
11815 Move sanitary_path_copy() to path.c and rename it to normalize_path_copy()
11816 Test and fix normalize_path_copy()
11817 Remove unused normalize_absolute_path()
11819 Junio C Hamano (16):
11820 Revert "Merge branch 'js/notes'"
11821 Modernize t5400 test script
11822 remote prune: warn dangling symrefs
11823 Warn use of "origin" when remotes/origin/HEAD is dangling
11824 Drop double-semicolon in C
11825 receive-pack: receive.denyDeleteCurrent
11826 builtin-receive-pack.c: do not initialize statics to 0
11827 revision traversal and pack: notice and die on missing commit
11828 Squelch overzealous "ignoring dangling symref" in an empty repository
11829 Make repack less likely to corrupt repository
11830 Prepare for 1.6.1.4.
11831 Revert "validate_headref: tighten ref-matching to just branches"
11832 Install the default "master" branch configuration after cloning a void
11833 Teach the "@{-1} syntax to "git branch"
11834 Teach @{-1} to git merge
11838 Remove redundant bit clears from diff_setup()
11841 tree.c: allow read_tree_recursive() to traverse gitlink entries
11843 Marcel M. Cary (1):
11844 git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree
11846 Marius Storm-Olsen (5):
11847 Add mailmap.file as configurational option for mailmap location
11848 Add find_insert_index, insert_at_index and clear_func functions to string_list
11849 Add map_user() and clear_mailmap() to mailmap
11850 Change current mailmap usage to do matching on both name and email of author/committer.
11851 Move mailmap documentation into separate file
11854 git-rebase.txt: --interactive does not work with --whitespace
11857 bash-completion: Complete the values of color.interactive, color.ui, color.pager
11859 Matt McCutchen (1):
11860 gitweb: add $prevent_xss option to prevent XSS by repository content
11862 Michael J Gruber (1):
11863 Fix the installation path for html documentation
11866 Bugfix: GIT_EXTERNAL_DIFF with more than one changed files
11869 Fix contrib/hooks/post-receive-email for new duplicate branch
11872 Fix GIT_CEILING_DIRECTORIES on Windows
11873 builtin-receive-pack.c: fix compiler warnings about format string
11876 Move 'rev-parse --git-dir' test to t1500
11877 t1500: more 'git rev-parse --git-dir' tests
11878 bash: fix misspelled 'git svn' option
11881 git-svn: abstract out a block into new method other_gs()
11884 doc/bundle: Use the more conventional suffix '.bundle'
11886 Shawn O. Pearce (2):
11887 Clear the delta base cache during fast-import checkpoint
11888 Clear the delta base cache if a pack is rebuilt
11890 Sitaram Chamarty (1):
11891 Documentation: clarify commits affected by gitk --merge
11894 add -p: get rid of Git.pm warnings about unitialized values
11895 Makefile: resort filenames alphabetically
11896 Generalize and libify index_is_dirty() to index_differs_from(...)
11899 use a hash of the lock token as the suffix for PUT/MOVE
11902 completion: Fix GIT_PS1_SHOWDIRTYSTATE to prevent unbound variable errors.
11903 completion: Get rid of tabbed indentation in comments. Replace with spaces.
11906 log: do not print ellipses with --abbrev-commit
11907 Documentation: pruning recipe for destructive filter-branch
11909 Todd Zullinger (1):
11910 git-web--browse: Fix check for /bin/start
11913 Version v1.6.2-rc0; changes since v1.6.1.4:
11914 -------------------------------------------
11917 builtin-shortlog.c: use string_list_append(), and don't strdup unnecessarily
11918 git.c: make autocorrected aliases work
11919 t7501-commit.sh: explicitly check that -F prevents invoking the editor
11921 Alexander Potashev (4):
11922 remove trailing LF in die() messages
11923 add is_dot_or_dotdot inline function
11924 Allow cloning to an existing empty directory
11925 Replace deprecated dashed git commands in usage
11927 Alexandre Julliard (8):
11928 git.el: Add a checkout command.
11929 git.el: Add a command to create a new branch.
11930 git.el: Add commands for cherry-pick and revert.
11931 git.el: Make git-run-command-region display the error if any.
11932 git.el: Set a regexp for paragraph-separate in log-edit mode.
11933 git.el: Use integer instead of character constants in case statement.
11934 git.el: Add some notes about Emacs versions compatibility.
11935 emacs: Remove the no longer maintained vc-git package.
11937 Arjen Laarhoven (1):
11938 t/t4202-log.sh: Add testcases
11940 Benjamin Kramer (1):
11943 Boyd Stephen Smith Jr (2):
11944 color-words: Support diff.wordregex config option
11945 Change the spelling of "wordregex".
11948 t7700: demonstrate misbehavior of 'repack -a' when local packs exist
11949 Makefile: use shell for-loop rather than Make's foreach loop during install
11951 Charles Bailey (7):
11952 Fix some tab/space inconsistencies in git-mergetool.sh
11953 Add -y/--no-prompt option to mergetool
11954 mergetool: Add prompt to continue after failing to merge a file
11955 mergetool: Don't keep temporary merge files unless told to
11956 mergetool: respect autocrlf by using checkout-index
11957 mergetool: Add a test for running mergetool in a sub-directory
11958 mergetool: fix running mergetool in sub-directories
11960 Christian Couder (1):
11961 sha1_file: make "read_object" static
11963 Clemens Buchacher (2):
11964 clean up pathspec matching
11965 remove pathspec_match, use match_pathspec instead
11968 contrib: add 'git difftool' for launching common merge tools
11969 difftool: fix documentation problems
11970 difftool: put the cursor on the editable file for Vim
11971 contrib/difftool: Don't repeat merge tool candidates
11973 David M. Syzdek (1):
11974 autoconf: Enable threaded delta search when pthreads are supported
11977 git-svn: add --authors-file test
11978 git-svn: handle empty files marked as symlinks in SVN
11979 git-svn: better attempt to handle broken symlink updates
11980 git-svn: fix SVN 1.1.x compatibility
11981 git-svn: avoid importing nested git repos
11982 git-svn: fix memory leak when checking for empty symlinks
11985 cvsserver: add option to configure commit message
11986 cvsserver: change generation of CVS author names
11988 Giuseppe Bilotta (16):
11989 gitweb: add patch view
11990 gitweb: change call pattern for git_commitdiff
11991 gitweb: add patches view
11992 gitweb: link to patch(es) view in commit(diff) and (short)log view
11993 gitweb: use href() when generating URLs in OPML
11994 gitweb: don't use pathinfo for global actions
11995 gitweb: suggest name for OPML view
11996 gitweb: channel image in rss feed
11997 gitweb: feed generator metadata
11998 gitweb: rss feed managingEditor
11999 gitweb: rss channel date
12000 gitweb: last-modified time should be commiter, not author
12001 gitweb: check if-modified-since for feeds
12002 gitweb: make static files accessible with PATH_INFO
12003 gitweb: webserver config for PATH_INFO
12004 gitweb: align comments to code
12007 Make opt_parse_with_commit() non-static
12008 Make has_commit() non-static
12009 git-tag: Add --contains option
12011 Jakub Narebski (4):
12012 gitweb: Move 'lineno' id from link to row element in git_blame
12013 gitweb: A bit of code cleanup in git_blame()
12014 gitweb: cache $parent_commit info in git_blame()
12015 gitweb: Update README that gitweb works better with PATH_INFO
12018 git-am: minor cleanups
12019 Makefile: minor improvements for Mac OS X (Darwin)
12022 Makefile: clean up TEST_PROGRAMS definition
12023 color: make it easier for non-config to parse color specs
12024 expand --pretty=format color options
12025 diff: refactor tempfile cleanup handling
12026 chain kill signals for cleanup functions
12027 refactor signal handling for cleanup functions
12028 pager: do wait_for_pager on signal death
12029 validate_headref: tighten ref-matching to just branches
12030 symbolic ref: refuse non-ref targets in HEAD
12031 t0005: use SIGTERM for sigchain test
12033 Johannes Gilger (1):
12034 mergetool: Don't repeat merge tool candidates
12036 Johannes Schindelin (24):
12037 Force t5302 to use a single thread
12038 Introduce commit notes
12039 Add a script to edit/inspect notes
12040 git wrapper: Make while loop more reader-friendly
12041 bundle: allow rev-list options to exclude annotated tags
12042 show <tag>: reuse pp_user_info() instead of duplicating code
12043 Implement the patience diff algorithm
12044 Introduce the diff option '--patience'
12045 bash completions: Add the --patience option
12046 Speed up git notes lookup
12047 Add an expensive test for git-notes
12048 Add color_fwrite_lines(), a function coloring each line individually
12049 color-words: refactor word splitting and use ALLOC_GROW()
12050 color-words: change algorithm to allow for 0-character word boundaries
12051 color-words: take an optional regular expression describing words
12052 Fix parsing of @{-1}@{1}
12053 rebase -i --root: fix check for number of arguments
12054 t3404 & t3411: undo copy&paste
12055 lib-rebase.sh: Document what set_fake_editor() does
12056 test-lib.sh: introduce test_commit() and test_merge() helpers
12060 Fix 'git diff --no-index' with a non-existing symlink target
12063 Windows: Fix signal numbers
12064 Windows: Fix intermittent failures of t7701
12067 Fix Documentation typos surrounding the word 'handful'.
12070 git-am: Make it easier to see which patch failed
12072 Junio C Hamano (26):
12073 Document "git-reset --merge"
12075 Resurrect "git apply --flags -" to read from the standard input
12076 git-am: add --directory=<dir> option
12077 Update 1.6.2 draft release notes
12078 git-am: fix shell quoting
12079 checkout: implement "@{-N}" shortcut name for N-th last branch
12080 git-am: re-fix the diag message printing
12081 interpret_nth_last_branch(): avoid traversing the reflog twice
12082 Fix reflog parsing for a malformed branch switching entry
12083 interpret_nth_last_branch(): plug small memleak
12084 Introduce for_each_recent_reflog_ent().
12085 Simplify parsing branch switching events in reflog
12086 http-push.c: style fixes
12087 am: Add --committer-date-is-author-date option
12088 rebase -i: correctly remember --root flag across --continue
12089 tests: Avoid single-shot environment export for shell function invocation
12090 Update draft release notes to 1.6.2
12091 fsck: HEAD is part of refs
12092 fsck: check loose objects from alternate object stores by default
12093 http-push.c: get_remote_object_url() is only used under USE_CURL_MULTI
12094 receive-pack: explain what to do when push updates the current branch
12095 t3412: further simplify setting of GIT_EDITOR
12096 tests: fix test_commit() for case insensitive filesystems
12097 Makefile: fix misdetection of relative pathnames
12101 test more combinations of ignore-whitespace options to diff
12103 Kirill Smelkov (1):
12104 mailinfo: cleanup extra spaces for complex 'From:'
12107 Cleanup of unused symcache variable inside diff-lib.c
12108 lstat_cache(): more cache effective symlink/directory detection
12109 lstat_cache(): introduce has_symlink_or_noent_leading_path() function
12110 lstat_cache(): introduce has_dirs_only_path() function
12111 lstat_cache(): introduce invalidate_lstat_cache() function
12112 lstat_cache(): introduce clear_lstat_cache() function
12115 bash completion: Add '--intent-to-add' long option for 'git add'
12116 bash completion: Use 'git add' completions for 'git stage'
12118 Linus Torvalds (1):
12119 Add 'merge' mode to 'git reset'
12121 Marcel Koeppen (1):
12122 git-svn: Show UUID in svn info for added directories with svn 1.5.5
12124 Markus Heidelberg (10):
12125 git-cherry: make <upstream> parameter optional
12126 Documentation: clarify which parameters are optional to git-cherry
12127 contrib/vim: change URL to point to the latest syntax files
12128 Documentation: let asciidoc align related options
12129 mergetool: put the cursor on the editable file for Vim
12130 contrib/difftool: change trap condition from SIGINT to INT
12131 contrib/difftool: remove distracting 'echo' in the SIGINT handler
12132 use uppercase POSIX compliant signals for the 'trap' command
12133 bash completion: add 'rename' subcommand to git-remote
12134 contrib/difftool: add support for Kompare
12137 gitweb: unify boolean feature subroutines
12139 Michele Ballabio (1):
12140 git-shortlog.txt: fix example about .mailmap
12143 Add support for a pdf version of the user manual
12144 parse-opt: migrate builtin-apply.
12145 gittutorial: remove misleading note
12147 Nanako Shiraishi (3):
12148 git-am: Add --ignore-date option
12149 Mention "local convention" rule in the CodingGuidelines
12150 git-bundle doc: update examples
12153 autodetect number of CPUs by default when using threads
12154 pack-objects: don't use too many threads with few objects
12157 config.mak.in: define paths without trailing slash
12160 git-svn: Add --localtime option to "fetch"
12162 Pierre Habouzit (1):
12163 filter-branch: add git_commit_non_empty_tree and --prune-empty.
12165 Ralf Wildenhues (1):
12166 Fix naming scheme for configure cache variables.
12169 http-push: refactor lock-related headers creation for curl requests
12172 diff: add option to show context between close hunks
12173 strbuf: instate cleanup rule in case of non-memory errors
12174 grep -w: forward to next possible position after rejected match
12175 grep: don't call regexec() for fixed strings
12178 Change NUL char handling of isspecial()
12179 Add is_regex_special()
12180 Optimize color_parse_mem
12183 bash: add '--merge' to 'git reset'
12184 bash: remove unnecessary checks for long options with argument
12185 bash: add missing format-patch command line options
12186 bash: refactor 'git log --pretty=<format>' options
12189 commit: more compact summary and without extra quotes
12190 tutorial-2: Update with the new "git commit" ouput
12192 Serge van den Boom (1):
12193 Makefile: Make 'configure --with-expat=path' actually work
12195 Stefan Karpinski (2):
12196 git-cvsserver: handle CVS 'noop' command.
12197 git-cvsserver: run post-update hook *after* update.
12199 Steffen Prohaska (6):
12200 Move computation of absolute paths from Makefile to runtime (in preparation for RUNTIME_PREFIX)
12201 git_extract_argv0_path(): Move check for valid argv0 from caller to callee
12202 Add calls to git_extract_argv0_path() in programs that call git_config_*
12203 Modify setup_path() to only add git_exec_path() to PATH
12204 Compute prefix at runtime if RUNTIME_PREFIX is set
12205 Windows: Revert to default paths and convert them by RUNTIME_PREFIX
12208 checkout: don't crash on file checkout before running post-checkout hook
12209 Move run_hook() from builtin-commit.c into run-command.c (libgit)
12210 api-run-command.txt: talk about run_hook()
12211 run_hook(): check the executability of the hook before filling argv
12212 run_hook(): allow more than 9 hook arguments
12215 Refactor git_set_argv0_path() to git_extract_argv0_path()
12217 Sverre Rabbelier (1):
12218 Allow cloning an empty repository
12221 http-push: refactor request url creation
12222 http-push: add back underscore separator before lock token
12223 http-push: wrap signature of get_remote_object_url
12226 bash-completion: Support running when set -u is enabled
12227 bash-completion: Try bash completions before simple filetype
12228 bash-completion: Add comments to remind about required arguments
12229 make: Remove -pthread on Darwin (it is included by cstdlib).
12232 Fix the building of user-manual.texi and gitman.texi documents
12233 Fix the building of gitman.info document
12234 diff-options.txt: Fix asciidoc markup issue
12237 rebase -i: execute hook only after argument checking
12238 rebase: learn to rebase root commit
12239 rebase -i: learn to rebase root commit
12240 rebase: update documentation for --root
12241 notes: fix core.notesRef documentation
12242 color-words: enable REG_NEWLINE to help user
12243 color-words: expand docs with precise semantics
12244 color-words: make regex configurable via attributes
12245 sha1_name: tweak @{-N} lookup
12246 sha1_name: support @{-N} syntax in get_sha1()
12247 checkout: implement "-" abbreviation, add docs and tests
12248 bash completion: move pickaxe options to log
12249 bash completion: refactor diff options
12250 t1505: remove debugging cruft
12251 t3412: clean up GIT_EDITOR usage
12252 t3412: use log|name-rev instead of log --graph
12253 bash: offer to show (un)staged changes
12254 add -p: change prompt separator for 'g'
12255 add -p: trap Ctrl-D in 'goto' mode
12256 contrib git-resurrect: find traces of a branch name and resurrect it
12257 add -p: prompt for single characters
12258 add -p: print errors in separate color
12259 add -p: import Term::ReadKey with 'require'
12261 Tor Arne Vestbø (1):
12262 git-notes: fix printing of multi-line notes
12264 Vitaly "_Vi" Shukela (3):
12265 git-svn: add --ignore-paths option for fetching
12266 git-svn: documented --ignore-paths
12267 git-svn: Add test for --ignore-paths parameter
12269 William Pursell (5):
12270 Add subroutine to display one-line summary of hunks
12271 Add 'g' command to go to a hunk
12272 git-add -i/-p: Change prompt separater from slash to comma
12273 Add / command in add --patch
12274 In add --patch, Handle K,k,J,j slightly more gracefully.
12276 jidanni@jidanni.org (1):
12277 git-show-branch doc: show -g as synonym to --reflog in the list
12279 martin f. krafft (1):
12280 git-am: implement --reject option passed to git-apply
12283 Version v1.6.1.4; changes since v1.6.1.3:
12284 -----------------------------------------
12287 Documentation: update graph api example.
12288 builtin-merge: fix a typo in an error message
12289 Documentation: fix a grammatical error in api-builtin.txt
12291 Björn Steinbrink (2):
12292 tree_entry_interesting: a pathspec only matches at directory boundary
12293 process_{tree,blob}: Remove useless xstrdup calls
12296 t7700-repack: add two new tests demonstrating repacking flaws
12297 git-repack.sh: don't use --kept-pack-only option to pack-objects
12298 pack-objects: only repack or loosen objects residing in "local" packs
12299 Remove --kept-pack-only option and associated infrastructure
12300 git-branch: display "was sha1" on branch deletion rather than just "sha1"
12301 t7700: demonstrate repack flaw which may loosen objects unnecessarily
12302 pack-objects: don't loosen objects available in alternate or kept packs
12305 builtin-revert.c: release index lock when cherry-picking an empty commit
12307 Christian Couder (3):
12308 rev-list: fix showing distance when using --bisect-all
12309 bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
12310 bisect: fix another instance of eval'ed string
12313 git-repack: use non-dashed update-server-info
12315 Daniel Cheng (aka SDiZ) (2):
12316 Fix bash completion in path with spaces
12317 State the effect of filter-branch on graft explicitly
12320 added missing backtick in git-apply.txt
12323 everyday: use the dashless form of git-init
12325 David J. Mellor (1):
12326 Documentation: minor grammatical fixes.
12329 fast-export: ensure we traverse commits in topological order
12330 Ensure proper setup of git_dir for git-hash-object
12333 test-lib: Clean up comments and Makefile.
12336 filter-branch: Fix fatal error on bare repositories
12338 Finn Arne Gangstad (1):
12339 Support "\" in non-wildcard exclusion entries
12341 Frank Lichtenheld (1):
12342 init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
12344 Geoffrey Thomas (2):
12345 utf8: add utf8_strwidth()
12346 builtin-blame.c: Use utf8_strwidth for author's names
12349 Documentation/git-push: --all, --mirror, --tags can not be combined
12352 Documentation: Remove an odd "instead"
12355 Documentation: clarify .gitattributes search
12358 builtin-remote: make rm() use properly named variable to hold return value
12359 builtin-remote: make rm operation safer in mirrored repository
12362 git: s/run_command/run_builtin/
12363 run_command(): handle missing command errors more gracefully
12364 run_command(): help callers distinguish errors
12365 git: use run_command() to execute dashed externals
12366 commit: abort commit if interactive add failed
12368 Johannes Schindelin (3):
12369 Fix submodule squashing into unrelated commit
12370 filter-branch: do not consider diverging submodules a 'dirty worktree'
12371 import-zips: fix thinko
12374 Make test-path-utils more robust against incorrect use
12375 Move sanitary_path_copy() to path.c and rename it to normalize_path_copy()
12376 Test and fix normalize_path_copy()
12377 Remove unused normalize_absolute_path()
12378 Propagate --exec-path setting to external commands via GIT_EXEC_PATH
12379 diff --no-index: Do not generate patch output if other output is requested
12381 Junio C Hamano (19):
12382 revision traversal: allow UNINTERESTING objects to be missing
12383 rebase -i squashes submodule changes into unrelated commit
12384 add -u: do not fail to resolve a path as deleted
12385 revision traversal and pack: notice and die on missing commit
12386 Make repack less likely to corrupt repository
12387 Prepare for 1.6.1.4.
12388 tests: fix "export var=val"
12389 Make sure objects/pack exists before creating a new pack
12390 git-repack: resist stray environment variable
12391 has_sha1_pack(): refactor "pretend these packs do not exist" interface
12392 has_sha1_kept_pack(): take "struct rev_info"
12393 Consolidate ignore_packed logic more
12394 Simplify is_kept_pack()
12395 is_kept_pack(): final clean-up
12396 blame: read custom grafts given by -S before calling setup_revisions()
12397 diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged
12398 match_tree_entry(): a pathspec only matches at directory boundaries
12399 diff -c -p: do not die on submodules
12402 Kirill Smelkov (4):
12403 mailinfo: correctly handle multiline 'Subject:' header
12404 mailinfo: 'From:' header should be unfold as well
12405 mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)'
12406 mailinfo: tests for RFC2047 examples
12408 Linus Torvalds (3):
12409 close_sha1_file(): make it easier to diagnose errors
12410 process_{tree,blob}: Remove useless xstrdup calls
12411 grep: fix segfault when "git grep '('" is given
12413 Markus Heidelberg (1):
12414 doc/git-daemon: add missing arguments to options
12416 Matt McCutchen (1):
12417 gitweb: add $prevent_xss option to prevent XSS by repository content
12420 Document git blame --reverse.
12421 More friendly message when locking the index fails.
12422 git-checkout.txt: fix incorrect statement about HEAD and index
12423 git-checkout.txt: clarify that <branch> applies when no path is given.
12426 Skip timestamp differences for diff --no-index
12429 Fix odb_mkstemp() on AIX
12431 Nico -telmich- Schottelius (1):
12432 git-tag(1): add hint about commit messages
12435 avoid possible overflow in delta size filtering computation
12438 Fix GIT_CEILING_DIRECTORIES on Windows
12440 Shawn O. Pearce (2):
12441 Clear the delta base cache during fast-import checkpoint
12442 Clear the delta base cache if a pack is rebuilt
12445 test-genrandom: Add newline to usage string
12447 Thomas Jarosch (1):
12448 Fix buffer overflow in config parser
12451 Documentation: format-patch --root clarifications
12452 bash completion: only show 'log --merge' if merging
12454 Todd Zullinger (1):
12455 Documentation: Note file formats send-email accepts
12458 Version v1.6.1.3; changes since v1.6.1.2:
12459 -----------------------------------------
12461 Anders Melchiorsen (2):
12462 Documentation: more git push examples
12463 Documentation: rework src/dst description in git push
12465 David J. Mellor (1):
12466 Fixed broken git help -w when installing from RPM
12469 fix typo in Documentation
12470 add test-dump-cache-tree in Makefile
12472 Johannes Schindelin (2):
12473 revision walker: include a detached HEAD in --all
12474 apply: fix access to an uninitialized mode variable, found by valgrind
12476 Junio C Hamano (6):
12477 bundle: allow the same ref to be given more than once
12478 Documentation: simplify refspec format description
12479 diff.c: output correct index lines for a split diff
12480 builtin-apply.c: do not set bogus mode in check_preimage() for deleted path
12481 grep: pass -I (ignore binary) down to external grep
12485 test more combinations of ignore-whitespace options to diff
12486 Fix combined use of whitespace ignore options to diff
12488 Linus Torvalds (1):
12489 Wrap inflate and other zlib routines for better error reporting
12492 Missing && in t/t7001.sh.
12493 Add a testcase for "git mv -f" on untracked files.
12494 builtin-mv.c: check for unversionned files before looking at the destination.
12497 merge: fix out-of-bounds memory access
12500 Fix gitdir detection when in subdir of gitdir
12503 urls.txt: document optional port specification in git URLS
12505 William Pursell (1):
12506 User-manual: "git stash <comment>" form is long gone
12509 Version v1.6.1.2; changes since v1.6.1.1:
12510 -----------------------------------------
12512 Björn Steinbrink (1):
12513 Rename detection: Avoid repeated filespec population
12516 avoid 31-bit truncation in write_loose_object
12518 Johannes Schindelin (2):
12519 get_sha1_basic(): fix invalid memory access, found by valgrind
12520 test-path-utils: Fix off by one, found by valgrind
12522 Junio C Hamano (4):
12523 ls-tree: add --full-tree option
12524 Teach format-patch to handle output directory relative to cwd
12525 send-pack: do not send unknown object name from ".have" to pack-objects
12528 Marcel M. Cary (1):
12529 git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X
12531 Markus Heidelberg (2):
12532 git-commit: color status output when color.ui is set
12533 git-status -v: color diff output when color.ui is set
12535 Nanako Shiraishi (1):
12536 Document git-ls-tree --full-tree
12538 Nguyễn Thái Ngọc Duy (2):
12539 grep: support --no-ext-grep to test builtin grep
12540 grep: grep cache entries if they are "assume unchanged"
12543 objects to be pruned immediately don't have to be loosened
12546 Version v1.6.1.1; changes since v1.6.1:
12547 ---------------------------------------
12550 git-shortlog.txt: improve documentation about .mailmap files
12551 git-send-email.txt: move --format-patch paragraph to a proper location
12553 Anders Melchiorsen (4):
12554 Documentation: git push repository can also be a remote
12555 Documentation: remove a redundant elaboration
12556 Documentation: mention branches rather than heads
12557 Documentation: avoid using undefined parameters
12559 Boyd Stephen Smith Jr (1):
12560 Fix Documentation for git-describe
12562 Christian Couder (1):
12563 builtin-fsck: fix off by one head count
12565 Clemens Buchacher (4):
12566 modify/delete conflict resolution overwrites untracked file
12567 unpack-trees: handle failure in verify_absent
12568 unpack-trees: fix path search bug in verify_absent
12569 unpack-trees: remove redundant path search in verify_absent
12571 Devin Doucette (1):
12572 gitweb: Fix export check in git_get_projects_list
12574 Felipe Contreras (1):
12575 fast-import: Cleanup mode setting.
12578 Use capitalized names where appropriate
12579 Be consistent in switch usage for tar
12582 Git.pm: call Error::Simple() properly
12585 README: tutorial.txt is now called gittutorial.txt
12587 Johannes Schindelin (7):
12588 merge-recursive: mark rename/delete conflict as unmerged
12589 bisect view: call gitk if Cygwin's SESSIONNAME variable is set
12590 git add: do not add files from a submodule
12591 http-push: fix off-by-path_len
12592 http-push: when making directories, have a trailing slash in the path name
12593 t5540: clarify that http-push does not handle packed-refs on the remote
12594 Rename diff.suppress-blank-empty to diff.suppressBlankEmpty
12596 Junio C Hamano (8):
12597 merge-recursive: do not clobber untracked working tree garbage
12598 Prepare for v1.6.1.1 maintenance release
12599 builtin-apply: prevent non-explicit permission changes
12600 git checkout: do not allow switching to a tree-ish that is not a commit
12601 format-patch: show patch text for the root commit
12602 Update draft release notes to 1.6.1.1
12603 Update draft release notes for 1.6.1.1
12606 Kirill A. Korinskiy (1):
12607 http-push: support full URI in handle_remote_ls_ctx()
12609 Lars Noschinski (1):
12610 shell: Document that 'cvs server' is a valid command
12612 Markus Heidelberg (2):
12613 doc/git-send-email: mention sendemail.cc config variable
12614 Documentation: let asciidoc align related options
12616 Michael J Gruber (2):
12617 add test cases for "git mv -k"
12618 fix handling of multiple untracked files for git mv -k
12621 fast-export: print usage when no options specified
12622 Make t3411 executable
12625 configure clobbers LDFLAGS
12627 Philippe Bruhat (1):
12628 Git.pm: correctly handle directory name that evaluates to "false"
12630 Pierre Habouzit (1):
12631 Avoid spurious error messages on error mistakes.
12634 daemon: handle freopen() failure
12635 daemon: cleanup: replace loop with if
12636 daemon: cleanup: factor out xstrdup_tolower()
12637 merge-file: handle freopen() failure
12638 pretty: factor out skip_empty_lines()
12639 pretty: factor out format_subject()
12640 pretty: support multiline subjects with format:
12641 shortlog: handle multi-line subjects like log --pretty=oneline et. al. do
12643 Shawn O. Pearce (1):
12644 describe: Avoid unnecessary warning when using --all
12647 t3501: check that commits are actually done
12648 t3404: Add test case for aborted --continue after "edit"
12649 t3404: Add test case for auto-amending only edited commits after "edit"
12650 builtin-commit.c: do not remove COMMIT_EDITMSG
12651 githooks.txt: add missing word
12654 diff: accept -- when using --no-index
12655 diff --no-index: test for pager after option parsing
12656 diff --no-index -q: fix endless loop
12658 jidanni@jidanni.org (4):
12659 Documentation/diff-options.txt: unify options
12660 Documentation/git-tag.txt: minor typo and grammar fix
12661 Documentation/git-push.txt: minor: compress one option
12662 contrib/examples/README: give an explanation of the status of these files
12665 Version v1.6.1; changes since v1.6.1-rc4:
12666 -----------------------------------------
12668 Johannes Schindelin (1):
12669 rebase -i -p: leave a --cc patch when a merge could not be redone
12672 Show a failure of rebase -p if the merge had a conflict
12673 rebase -i -p: Fix --continue after a merge could not be redone
12675 Junio C Hamano (1):
12679 t9129: skip the last three tests if UTF-8 locale is not available
12682 Version v1.6.1-rc4; changes since v1.6.1-rc3:
12683 ---------------------------------------------
12685 Alexander Gavrilov (2):
12686 git-gui: Fix handling of relative paths in blame.
12687 git-gui: Fix commit encoding handling.
12689 Arjen Laarhoven (1):
12690 Enable threaded delta search on Mac OS X/Darwin
12692 Boyd Stephen Smith Jr (1):
12693 git-revert documentation: refer to new HOWTO on reverting faulty merges
12695 Christian Stimming (3):
12696 git-gui: Update German (completed) translation.
12697 gitk: Mark forgotten strings (header sentence parts in color chooser) for translation
12698 gitk: Update German translation
12701 git-mergetool: properly handle "git mergetool -- filename"
12703 Fredrik Skolmli (1):
12704 git-gui: Starting translation for Norwegian
12706 Giuseppe Bilotta (1):
12707 gitk: Map / to focus the search box
12709 Johannes Schindelin (3):
12710 fast-import: close pack before unlinking it
12711 git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL
12712 fast-export: deal with tag objects that do not have a tagger
12715 gitk: Use check-buttons' -text property instead of separate labels
12716 gitk: Ensure that "Reset branch" menu entry is enabled
12717 gitk: Force the focus to the main window on Windows
12719 Junio C Hamano (12):
12720 git-show: do not segfault when showing a bad tag
12721 pager: do not dup2 stderr if it is already redirected
12722 gitweb: do not run "git diff" that is Porcelain
12724 gitweb: do not run "git diff" that is Porcelain
12725 make_absolute_path(): check bounds when seeing an overlong symlink
12726 builtin-blame.c: use strbuf_readlink()
12727 combine-diff.c: use strbuf_readlink()
12728 fast-import: make tagger information optional
12729 Make sure lockfiles are unlocked when dying on SIGPIPE
12730 send-email: futureproof split_addrs() sub
12734 gitk: Allow unbalanced quotes/braces in commit headers
12736 Kirill A. Korinskiy (1):
12737 Remove the requirement opaquelocktoken uri scheme
12740 bash completion: Sort config completion variables
12741 bash completion: Sync config variables with their man pages
12743 Linus Torvalds (5):
12744 Add generic 'strbuf_readlink()' helper function
12745 Make 'ce_compare_link()' use the new 'strbuf_readlink()'
12746 Make 'index_path()' use 'strbuf_readlink()'
12747 Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'
12748 Make 'prepare_temp_file()' ignore st_size for symlinks
12750 Marcel M. Cary (1):
12751 git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dir
12753 Markus Heidelberg (7):
12754 Documentation: fix description for enabling hooks
12755 doc/git-reset: add reference to git-stash
12756 Documentation: sync example output with git output
12757 Documentation: fix typos, grammar, asciidoc syntax
12758 Documentation: fix typos, grammar, asciidoc syntax
12759 Documentation/git-show-branch: work around "single quote" typesetting glitch
12760 doc/git-fsck: change the way for getting heads' SHA1s
12762 Michael J Gruber (1):
12763 test overlapping ignore patterns
12765 Michele Ballabio (1):
12766 git gui: update Italian translation
12769 git-gui: Update Hungarian translation for 0.12
12770 git-daemon documentation: use {tilde}
12771 githooks documentation: add a note about the +x mode
12772 SubmittingPatches: mention the usage of real name in Signed-off-by: lines
12774 Nanako Shiraishi (3):
12775 git-gui: Update Japanese translation for 0.12
12776 Clarify documentation of "git checkout <tree-ish> paths" syntax
12777 Add a documentat on how to revert a faulty merge
12779 Paul Mackerras (1):
12780 gitk: Fix bugs in blaming code
12782 Peter Krefting (2):
12783 git-gui: Updated Swedish translation (515t0f0u).
12784 git-gui: Fixed typos in Swedish translation.
12787 Fix type-mismatch compiler warning from diff_populate_filespec()
12788 connect.c: stricter port validation, silence compiler warning
12789 fast-import.c: stricter strtoul check, silence compiler warning
12791 Richard Hartmann (2):
12792 Make help entries alphabetical
12793 Always show which directory is not a git repository
12795 Robin Rosenberg (1):
12796 git-revert: record the parent against which a revert was made
12798 Shawn O. Pearce (2):
12799 git-gui: Update po template to include 'Mirroring %s' message
12803 git-send-email: handle email address with quoted comma
12806 Version v1.6.1-rc3; changes since v1.6.1-rc2:
12807 ---------------------------------------------
12809 Alexander Gavrilov (1):
12810 Documentation: Describe git-gui Tools menu configuration options.
12812 Alexander Potashev (2):
12813 Fix typos in documentation
12814 Fix typo in comment in builtin-add.c
12816 Alexey Borzenkov (1):
12817 Define linkgit macro in [macros] section
12820 git-branch: display sha1 on branch deletion
12823 git-svn: Make following parents atomic
12825 Jakub Narebski (1):
12826 gitweb: Fix bug in insert_file() subroutine
12829 reorder ALLOW_TEXTCONV option setting
12830 diff: allow turning on textconv explicitly for plumbing
12831 diff: fix handling of binary rewrite diffs
12832 diff: respect textconv in rewrite diffs
12833 rebase: improve error messages about dirty state
12836 git-config.txt: fix a typo
12838 Johannes Schindelin (1):
12839 Get rid of the last remnants of GIT_CONFIG_LOCAL
12841 Junio C Hamano (4):
12842 builtin-checkout.c: check error return from read_cache()
12843 read-cache.c: typofix in comment
12844 work around Python warnings from AsciiDoc
12847 Linus Torvalds (1):
12848 fsck: reduce stack footprint
12850 Markus Heidelberg (1):
12851 builtin-commit: remove unused message variable
12854 make sure packs to be replaced are closed beforehand
12856 Ralf Wildenhues (1):
12857 Improve language in git-merge.txt and related docs
12859 Tor Arvid Lund (1):
12860 git-p4: Fix regression in p4Where method.
12862 YONETANI Tomokazu (1):
12863 git-fast-import possible memory corruption problem
12866 Version v1.6.1-rc2; changes since v1.6.1-rc1:
12867 ---------------------------------------------
12870 Make some of fwrite/fclose/write/close failures visible
12871 Make chdir failures visible
12872 Report symlink failures in merge-recursive
12874 Alexander Gavrilov (2):
12875 gitk: Make line origin search update the busy status
12876 gitk: Add a menu option to start git gui
12878 Christian Couder (2):
12879 bisect: fix "git bisect skip <commit>" and add tests cases
12880 Documentation: describe how to "bisect skip" a range of commits
12882 Christian Stimming (1):
12883 gitk: Update German translation
12885 Davide Libenzi (1):
12886 xdiff: give up scanning similar lines early
12889 git-svn: Make branch use correct svn-remote
12891 Giuseppe Bilotta (2):
12892 gitweb: make gitweb_check_feature a boolean wrapper
12893 Update comment on gitweb_check/get_feature
12895 Jakub Narebski (2):
12896 gitweb: Fix handling of non-ASCII characters in inserted HTML files
12897 gitweb: Make project specific override for 'grep' feature work
12900 add stage to gitignore
12901 tag: delete TAG_EDITMSG only on successful tag
12904 t4030-diff-textconv: Make octal escape sequence more portable
12906 Junio C Hamano (17):
12907 builtin-rm.c: explain and clarify the "local change" logic
12908 git add --intent-to-add: fix removal of cached emptiness
12909 git add --intent-to-add: do not let an empty blob be committed by accident
12910 gitweb: fix 'ctags' feature check and others
12911 gitweb: rename gitweb_check_feature to gitweb_get_feature
12912 Makefile: introduce NO_PTHREADS
12913 Install git-stage in exec-path
12914 git-am --whitespace: do not lose the command line option
12915 git-am: propagate -C<n>, -p<n> options as well
12916 git-am: propagate --3way options as well
12917 Test that git-am does not lose -C/-p/--whitespace options
12918 git-am: rename apply_opt_extra file to apply-opt
12919 Update draft release notes to 1.6.1
12921 Update draft release notes for 1.6.1
12922 Revert "git-stash: use git rev-parse -q"
12923 Point "stale" 1.6.0.5 documentation from the main git documentation page
12925 Linus Torvalds (1):
12926 Add backslash to list of 'crud' characters in real name
12929 git-gui: Teach start_push_anywhere_action{} to notice when remote is a mirror.
12931 Matt McCutchen (1):
12932 "git diff <tree>{3,}": do not reverse order of arguments
12935 User's Manual: remove duplicated url at the end of Appendix B
12936 git-stash: use git rev-parse -q
12937 filter-branch: use git rev-parse -q
12938 lost-found: use git rev-parse -q
12939 pull: use git rev-parse -q
12940 rebase: use git rev-parse -q
12941 submodule: use git rev-parse -q
12942 http.c: use 'git_config_string' to get 'curl_http_proxy'
12944 Nguyễn Thái Ngọc Duy (1):
12945 Extend index to save more flags
12947 Paul Mackerras (3):
12948 gitk: Fix context menu items for generating diffs when in tree mode
12949 gitk: Highlight only when search type is "containing:".
12950 gitk: Fix bug in accessing undefined "notflag" variable
12953 Add a built-in alias for 'stage' to the 'add' command
12956 fetch-pack: Avoid memcpy() with src==dst
12958 Tor Arvid Lund (1):
12959 git-p4: Fix bug in p4Where method.
12962 Version v1.6.1-rc1; changes since v1.6.0.6:
12963 -------------------------------------------
12965 Abhijit Menon-Sen (1):
12966 Make cherry-pick use rerere for conflict resolution.
12969 Extend "checkout --track" DWIM to support more cases
12970 Remove calculation of the longest command name from where it is not used
12971 Remove useless memset of static command name lists in builtin-merge.c
12972 Make main_cmds and other_cmds local to builtin-help.c
12973 Allow git help work without PATH set
12974 list_commands: only call git_exec_path if it is needed
12975 Add help.autocorrect to enable/disable autocorrecting
12976 Cleanup remove_path
12977 Fix potentially dangerous uses of mkpath and git_path
12978 Fix handle leak in sha1_file/unpack_objects if there were damaged object data
12979 Fix t4030-diff-textconv.sh
12981 Alexander Gavrilov (58):
12982 git-gui: Support starting gitk from Gui Blame
12983 git-gui: Support passing blame to a parent commit.
12984 git-gui: Better positioning in Blame Parent Commit
12985 git-gui: Allow specifying an initial line for git gui blame.
12986 gitk: Add option to specify the default commit on command line
12987 gitk: Add menu item for calling git gui blame
12988 git-gui: Support resolving conflicts via the diff context menu.
12989 git-gui: Support calling merge tools.
12990 git-gui: Don't allow staging files with conflicts.
12991 git-gui: Support more merge tools.
12992 git-gui: Support conflict states _U & UT.
12993 git-gui: Reimplement and enhance auto-selection of diffs.
12994 git-gui: Make F5 reselect a diff, if an untracked file is selected.
12995 git-gui: Show special diffs for complex conflict cases.
12996 git-gui: Fix Blame Parent & Context for working copy lines.
12997 git-gui: Restore ability to Stage Working Copy for conflicts.
12998 gitk: Fix a bug in collapsing deeply nested trees
12999 git-gui: Add more integration options to citool.
13000 git-gui: Cleanup handling of the default encoding.
13001 git-gui: Add a menu of available encodings.
13002 git-gui: Allow forcing display encoding for diffs using a submenu.
13003 git-gui: Optimize encoding name resolution using a lookup table.
13004 git-gui: Support the encoding menu in gui blame.
13005 git-gui: Reenable staging unmerged files by clicking the icon.
13006 git-gui: Make Ctrl-T safe to use for conflicting files.
13007 git-gui: Fix the blame window shape.
13008 git-gui: Add a search command to the blame viewer.
13009 git-gui: Fix the blame viewer destroy handler.
13010 gitk: Enhance file encoding support
13011 gitk: Implement batch lookup and caching of encoding attrs
13012 gitk: Allow forcing branch creation if it already exists
13013 gitk: Fix file list context menu for merge commits
13014 builtin-blame: Reencode commit messages according to git-log rules.
13015 gitk: Allow starting gui blame for a specific line
13016 git-gui: Add a dialog that shows the OpenSSH public key.
13017 git-gui: Add a simple implementation of SSH_ASKPASS.
13018 Windows: Make OpenSSH properly detect tty detachment.
13019 gitweb: Use single implementation of export_ok check.
13020 gitweb: Add a per-repository authorization hook.
13021 gitweb: Fix mod_perl support.
13022 gitk: Add Return and Escape bindings to dialogs
13023 gitk: Make gitk dialog windows transient
13024 gitk: Make cherry-pick call git-citool on conflicts
13025 gitk: Implement a user-friendly Edit View dialog
13026 git-gui: Fix focus transition in the blame viewer.
13027 git-gui: Add the Show SSH Key item to the clone dialog.
13028 git-gui: Request blame metadata in utf-8.
13029 gitk: Add accelerators to frequently used menu commands
13030 gitk: Fix transient windows on Win32 and MacOS
13031 gitk: Fix commit encoding support
13032 Documentation: New GUI configuration and command-line options.
13033 git-gui: Implement system-wide configuration handling.
13034 git-gui: Fix the after callback execution in rescan.
13035 git-gui: Add a Tools menu for arbitrary commands.
13036 git-gui: Allow Tools request arguments from the user.
13037 git-gui: Implement automatic rescan after Tool execution.
13038 git-gui: Fix the search bar destruction handler.
13039 gitk: Avoid handling the Return key twice in Add Branch
13041 Alexandre Julliard (9):
13042 git.el: Improve error handling for commits.
13043 git.el: Remove the env parameter in git-call-process and git-call-process-string.
13044 git.el: Simplify handling of merge heads in the commit log-edit buffer.
13045 git.el: Properly handle merge commits in git-amend-commit.
13046 git.el: Fix git-amend-commit to support amending an initial commit.
13047 git.el: Never clear the status buffer, only update the files.
13048 git.el: Add an insert file command.
13049 git.el: Add possibility to mark files directly in git-update-status-files.
13050 git.el: Allow to commit even if there are no marked files.
13052 Anders Melchiorsen (2):
13053 wt-status: Split header generation into three functions
13054 wt-status: Teach how to discard changes in the working directory
13056 Andreas Ericsson (3):
13057 Teach "git diff -p" to locate PHP class methods
13058 git commit: Reformat output somewhat
13059 rebase: Support preserving merges in non-interactive mode
13061 Arjen Laarhoven (1):
13062 t6023-merge-file: Work around non-portable sed usage
13065 for-each-ref: `:short` format for `refname`
13068 remote.c: add a function for deleting a refspec array and use it (twice)
13069 dir.c: Avoid c99 array initialization
13070 t4018-diff-funcname: test syntax of builtin xfuncname patterns
13071 diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785
13072 xdiff-interface.c: strip newline (and cr) from line before pattern matching
13073 Replace xmalloc/memset(0) pairs with xcalloc
13074 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
13075 Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer
13076 t4018-diff-funcname: add objective-c xfuncname pattern to syntax test
13079 Make xdi_diff_outf interface for running xdiff_outf diffs
13080 Use strbuf for struct xdiff_emit_state's remainder
13081 Always initialize xpparam_t to 0
13082 Allow alternate "low-level" emit function from xdl_diff
13084 Brian Gernhardt (2):
13085 format-patch: autonumber by default
13086 Avoid using non-portable `echo -n` in tests.
13089 git-remote: match usage string with the manual pages
13090 git-remote: add verbose mode to git remote update
13092 Christian Couder (10):
13093 merge-base: teach "git merge-base" to drive underlying merge_bases_many()
13094 bisect: test merge base if good rev is not an ancestor of bad rev
13095 bisect: only check merge bases when needed
13096 bisect: remove "checkout_done" variable used when checking merge bases
13097 refs: improve comments about "reading" argument of "resolve_ref"
13098 bisect: fix missing "exit"
13099 Documentation: user-manual: add information about "git help" at the beginning
13100 Documentation: tutorial: add information about "git help" at the beginning
13101 git-gui: french translation update
13102 bisect: teach "skip" to accept special arguments like "A..B"
13104 Christian Stimming (5):
13105 git-gui: Mark forgotten strings for translation.
13106 git-gui: I18n fix sentence parts into full sentences for translation again.
13107 git-gui: Updated German translation.
13108 gitk: Add untranslated error messages to translation
13109 git-gui: Update German translation.
13112 git-merge documentation: more details about resolving conflicts
13115 Fix non-literal format in printf-style calls
13118 git-submodule: replace duplicated code with a module_list function
13119 git-submodule: add "sync" command
13120 tests: add a testcase for "git submodule sync"
13123 Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" is set
13125 David M. Syzdek (5):
13126 Build: add NO_UINTMAX_T to support ancient systems
13127 Add Makefile check for FreeBSD 4.9-SECURITY
13128 autoconf: Add link tests to each AC_CHECK_FUNC() test
13129 Make Pthread link flags configurable
13130 Add autoconf tests for pthreads
13132 David Soria Parra (1):
13133 cast pid_t's to uintmax_t to improve portability
13136 git-diff: Add --staged as a synonym for --cached.
13138 Davide Libenzi (1):
13139 xdiff: give up scanning similar lines early
13142 git-svn: testcase for partial rebuild
13143 git-svn: do a partial rebuild if rev_map is out-of-date
13144 git-svn: proper detection of bare repositories
13145 git-svn: proper detection of bare repositories
13147 Dmitry Potapov (14):
13148 teach index_fd to work with pipes
13149 correct argument checking test for git hash-object
13150 correct usage help string for git-hash-object
13151 use parse_options() in git hash-object
13152 add --path option to git hash-object
13153 add --no-filters option to git hash-object
13154 mingw: remove use of _getdrive() from lstat/fstat
13155 add have_git_dir() function
13156 mingw: move common functionality to win32.h
13157 cygwin: Use native Win32 API for stat
13158 do not segfault if make_cache_entry failed
13159 print an error message for invalid path
13160 check-attr: add an internal check_attr() function
13161 check-attr: Add --stdin option
13164 Use xmalloc() and friends to catch allocation failures
13167 git-svn: check error code of send_txstream
13168 t9124: clean up chdir usage
13169 git-svn: fix handling of even funkier branch names
13170 git-svn: don't escape tilde ('~') for http(s) URLs
13171 git-svn: respect i18n.commitencoding config
13172 git-svn: don't escape tilde ('~') for http(s) URLs
13173 git-svn: respect i18n.commitencoding config
13175 Florian Ragwitz (1):
13176 Add git-svn branch to allow branch creation in SVN repositories
13178 Florian Weimer (3):
13179 git-svn: extract base blob in generate_diff
13180 git-svn: Introduce SVN::Git::Editor::_chg_file_get_blob
13181 git-svn: Send deltas during commits
13183 Fredrik Skolmli (1):
13184 Documentation: Spelling fix
13187 Fixed some grammatical errors in git-rebase.txt documentation.
13189 Giovanni Funchal (1):
13190 configure: auto detect dynamic library path switches
13192 Giuseppe Bilotta (12):
13193 gitweb: ref markers link to named shortlogs
13194 gitweb: shortlog now also obeys $hash_parent
13195 gitweb: refactor input parameters parse/validation
13196 gitweb: parse project/action/hash_base:filename PATH_INFO
13197 gitweb: generate project/action/hash URLs
13198 gitweb: use_pathinfo filenames start with /
13199 gitweb: parse parent..current syntax from PATH_INFO
13200 gitweb: generate parent..current URLs
13201 gitweb: make the supported snapshot formats array global
13202 gitweb: retrieve snapshot format from PATH_INFO
13203 gitweb: embed snapshot format parameter in PATH_INFO
13204 git-gui: try to provide a window icon under X
13206 Gustaf Hendeby (2):
13207 Update .gitignore to ignore git-help
13208 git-gui: Teach git gui about file type changes
13211 diff --dirstat-by-file: count changed files, not lines
13213 Jakub Narebski (1):
13214 gitweb: Better processing format string in custom links in navbar
13217 Introduce receive.denyDeletes
13220 run-command: add pre-exec callback
13221 spawn pager via run_command interface
13222 format-patch: use default diff format even with patch options
13223 tests: grep portability fixes
13224 reformat informational commit message
13225 tutorial: update output of git commit
13226 tests: shell negation portability fix
13227 t4012: use test_cmp instead of cmp
13228 diff: unify external diff and funcname parsing code
13229 diff: introduce diff.<driver>.binary
13230 diff: add filter for converting binary to text
13231 document "intent to add" option to git-add
13232 rm: loosen safety valve for empty files
13233 submodule: fix some non-portable grep invocations
13234 diff: add missing static declaration
13235 document the diff driver textconv feature
13236 refactor userdiff textconv code
13237 userdiff: require explicitly allowing textconv
13238 only textconv regular files
13239 wt-status: load diff ui config
13240 add userdiff textconv tests
13241 enable textconv for diff in verbose status/commit
13242 t5400: expect success for denying deletion
13243 t5516: refactor oddball tests
13244 receive-pack: detect push to current branch of non-bare repo
13245 define empty tree sha1 as a macro
13246 wt-status: refactor initial commit printing
13247 status: show "-v" diff even for initial commit
13250 add boolean diff.suppress-blank-empty config option
13251 SubmittingPatches: fix a typo
13252 reword --full-index description
13253 xdiff-interface.c: remove 10 duplicated lines
13256 git-daemon: set REMOTE_ADDR to client address
13257 sha1_file: avoid bogus "file exists" error message
13260 Teach "git diff -p" HTML funcname patterns
13261 Fix AsciiDoc errors in merge documentation
13262 Fix submodule sync with relative submodule URLs
13264 Johannes Schindelin (7):
13265 t9700: remove useless check
13266 tests: Clarify dependencies between tests, 'aggregate-results' and 'clean'
13267 Enable parallel tests
13268 checkout --track: make up a sensible branch name if '-b' was omitted
13269 test-lib: do not remove trash_directory if called with --debug
13270 git wrapper: DWIM mistyped commands
13271 Document levenshtein.c
13273 Johannes Sixt (11):
13274 Revert "Windows: Use a customized struct stat that also has the st_blocks member."
13275 filter-branch: Grok special characters in tag names
13276 Windows: git-shell can be compiled again
13277 compat/mingw: Support a timeout in the poll emulation if no fds are given
13278 git-gui: Do not automatically stage file after merge tool finishes
13279 git-gui: Remove space from the end of aspell's reply before processing
13280 git-gui: Fix switch statement in lib/merge.tcl
13281 git-gui: Show a round number of bytes of large untracked text files
13282 git-gui: Mark-up strings in show_{other,unmerged}_diff() for localization
13283 git-remote: list branches in vertical lists
13284 git-gui: Do not munge conflict marker lines in a normal diff
13287 git-p4: Support purged files and optimize memory usage
13288 git-p4: Cache git config for performance
13291 git-check-attr(1): use 'verse' for multi-line synopsis sections
13293 Jonathan del Strother (3):
13294 Revert "Convert output messages in merge-recursive to past tense."
13295 Add OS X support to the pre-auto-gc example hook
13296 Teach git diff about Objective-C syntax
13298 Joshua Williams (1):
13299 git-gui: Add support for calling out to the prepare-commit-msg hook
13301 Junio C Hamano (78):
13302 builtin-add.c: restructure the code for maintainability
13303 builtin-add.c: optimize -A option and "git add ."
13304 imap-send.c: more style fixes
13305 documentation: merge-base: explain "git merge-base" with more than 2 args
13306 merge-base-many: add trivial tests based on the documentation
13307 git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge
13308 revision.c: whitespace fix
13309 revision traversal: show full history with merge simplification
13310 Topo-sort before --simplify-merges
13311 update-index: refuse to add working tree items beyond symlinks
13312 add: refuse to add working tree items beyond symlinks
13313 xdiff-interface: hide the whole "xdiff_emit_state" business from the caller
13314 revision --simplify-merges: use decoration instead of commit->util field
13315 index: future proof for "extended" index entries
13316 tests: use $TEST_DIRECTORY to refer to the t/ directory
13318 Makefile: Allow CC_LD_DYNPATH to be overriden
13319 revision --simplify-merges: do not leave commits unprocessed
13320 revision --simplify-merges: make it a no-op without pathspec
13321 compat: introduce on_disk_bytes()
13322 shell: do not play duplicated definition games to shrink the executable
13323 Build-in "git-shell"
13324 Update draft release notes for 1.6.1
13325 Fix "git-merge -s bogo" help text
13326 templates/Makefile: install is unnecessary, just use mkdir -p
13327 t7606: fix custom merge test
13328 Revert "Build-in "git-shell""
13329 daemon.c: minor style fixup
13330 checkout -f: allow ignoring unmerged paths when checking out of the index
13331 checkout --ours/--theirs: allow checking out one side of a conflicting merge
13332 xdl_fill_merge_buffer(): separate out a too deeply nested function
13333 xdiff-merge: optionally show conflicts in "diff3 -m" style
13334 xmerge.c: minimum readability fixups
13335 xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
13336 rerere.c: use symbolic constants to keep track of parsing states
13337 rerere: understand "diff3 -m" style conflicts with the original
13338 merge.conflictstyle: choose between "merge" and "diff3 -m" styles
13339 git-merge-recursive: learn to honor merge.conflictstyle
13340 checkout -m: recreate merge when checking out of unmerged index
13341 diff: vary default prefix depending on what are compared
13342 git commit --author=$name: look $name up in existing commits
13343 git-add --intent-to-add (-N)
13344 checkout --conflict=<style>: recreate merge in a non-default style
13345 git-merge documentation: describe how conflict is presented
13346 Update draft release notes for 1.6.1
13347 safe_create_leading_directories(): make it about "leading" directories
13348 git-apply:--include=pathspec
13349 Update draft release notes for 1.6.1
13350 daemon.c: avoid setlinebuf()
13351 is_directory(): a generic helper function
13352 receive-pack: make it a builtin
13353 push: prepare sender to receive extended ref information from the receiver
13354 push: receiver end advertises refs from alternate repositories
13355 Fix git-diff-tree --stdin
13356 diff: use extended regexp to find hunk headers
13357 diff: fix "multiple regexp" semantics to find hunk header comment
13358 Update draft release notes to 1.6.1
13359 t5510: test "git fetch" following tags minimally
13360 Update draft release notes to 1.6.1
13361 Fix reading of cloud tags
13362 Update draft release notes for 1.6.1
13363 Fix mismerge at cdb22c4 in builtin-checkout.c
13364 rebase-i-p: minimum fix to obvious issues
13365 git-rebase--interactive.sh: comparision with == is bashism
13366 receive-pack: fix "borrowing from alternate object store" implementation
13367 compat/cygwin.c: make runtime detection of lstat/stat lessor impact
13368 Stop using compat/regex.c on platforms with working regexp library
13369 Update draft release notes to 1.6.1
13370 Update draft release notes to 1.6.1
13371 Update draft release notes to 1.6.1
13372 t5303: work around printf breakage in dash
13373 t5303: fix printf format string for portability
13374 git.html: Update the links to stale versions
13375 Update draft release notes to 1.6.1
13376 builtin-remote.c: plug a small memory leak in get_one_remote_for_updates()
13377 send-email: do not reverse the command line arguments
13378 Include git-gui--askpass in git-gui RPM package
13381 Karl Hasselström (4):
13382 Refactoring: Split up diff_tree_stdin
13383 diff-tree: Note that the commit ID is printed with --stdin
13384 Teach git diff-tree --stdin to diff trees
13385 Add test for diff-tree --stdin with two trees
13387 Kirill Smelkov (1):
13388 Teach "git diff -p" Python funcname patterns
13391 bash completion: Add 'workflows' to 'git help'
13392 workflows documentation: fix link to git-request-pull[1]
13394 Linus Torvalds (8):
13395 date/time: do not get confused by fractional seconds
13396 Add a 'source' decorator for commits
13397 revision: make tree comparison functions take commits rather than trees
13398 Make '--decorate' set an explicit 'show_decorations' flag
13399 revision traversal: '--simplify-by-decoration'
13400 Add cache preload facility
13401 Fix machine-parseability of 'git log --source'
13402 Fix index preloading for racy dirty case
13404 Marcel Koeppen (1):
13405 t9129-git-svn-i18n-commitencoding: Make compare_svn_head_with() compatible with OSX sed
13408 count-objects: Add total pack size to verbose output
13409 Update t/.gitignore to ignore all trash directories
13411 Marek Zawirski (1):
13412 Make push more verbose about illegal combination of options
13415 Documentation: rev-list-options.txt: added --branches, --tags & --remotes.
13416 git-commit.txt - mention that files listed on the command line must be known to git.
13419 git-submodule - Add 'foreach' subcommand
13420 git-submodule.sh - Remove trailing / from URL if found
13421 git-submodule.sh - Remove trailing / from URL if found
13422 git-submodule - Use "get_default_remote" from git-parse-remote
13423 compat/cygwin.c - Use cygwin's stat if core.filemode == true
13425 Markus Heidelberg (1):
13426 Makefile: add install-man rules (quick and normal)
13428 Marten Svanfeldt (dev) (2):
13429 Git.pm: Make _temp_cache use the repository directory
13430 git-svn: Update git-svn to use the ability to place temporary files within repository directory
13432 Matt McCutchen (2):
13433 "git diff <tree>{3,}": do not reverse order of arguments
13434 git-merge-recursive: honor merge.conflictstyle once again
13436 Matthias Kestenholz (1):
13437 bash-completion: Add all submodule subcommands to the completion list
13439 Michael J Gruber (3):
13440 allow installation of man and html doc from the man and html branches
13441 separate build targets for man and html documentation
13442 make prune report removed objects on -v
13444 Michael Witten (9):
13445 Docs: send-email's usage text and man page mention same options
13446 Docs: send-email usage text much sexier
13447 Docs: send-email: Man page option ordering
13448 send-email: change --no-validate to boolean --[no-]validate
13449 Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to
13450 Docs: send-email: Remove unnecessary config variable description
13451 Docs: send-email: Create logical groupings for --help text
13452 Docs: send-email: Create logical groupings for man text
13453 send-email: signedoffcc -> signedoffbycc, but handle both
13455 Michele Ballabio (1):
13456 git gui: update Italian translation
13458 Mikael Magnusson (1):
13459 Correct output of git-count-objects.
13462 gitweb: Sort the list of forks on the summary page by age
13465 builtin-help: make some internal functions available to other builtins
13466 builtin-merge: allow using a custom strategy
13467 Add a new test for using a custom merge strategy
13468 Add a second testcase for handling invalid strategies in git-merge
13469 builtin-help: always load_command_list() in cmd_help()
13471 Split out merge_recursive() to merge-recursive.c
13472 merge-recursive: introduce merge_options
13473 builtin-merge: avoid run_command_v_opt() for recursive and subtree
13474 cherry-pick/revert: make direct internal call to merge_tree()
13475 merge-recursive: move call_depth to struct merge_options
13476 merge-recursive: get rid of the index_only global variable
13477 merge-recursive: move the global obuf to struct merge_options
13478 merge-recursive: move current_{file,directory}_set to struct merge_options
13479 merge-recursive: get rid of virtual_id
13480 builtin-merge: release the lockfile in try_merge_strategy()
13481 commit_tree(): add a new author parameter
13482 builtin-commit: use commit_tree()
13483 t7603: add new testcases to ensure builtin-commit uses reduce_heads()
13484 builtin-merge: refresh the index before calling a strategy
13485 builtin-commit: use reduce_heads() only when appropriate
13486 Cleanup in sha1_file.c::cache_or_unpack_entry()
13487 Implement git clone -v
13488 Add Linux PPC support to the pre-auto-gc example hook
13489 parse-opt: migrate builtin-checkout-index.
13490 Implement git remote rename
13491 remote: add a new 'origin' variable to the struct
13492 git-remote rename: migrate from remotes/ and branches/
13493 git-remote: document the migration feature of the rename subcommand
13494 Update Hungarian translation. 100% completed.
13495 builtin-branch: use strbuf in delete_branches()
13496 builtin-branch: use strbuf in fill_tracking_info()
13497 builtin-branch: use strbuf in rename_branch()
13498 builtin-clone: use strbuf in guess_dir_name()
13499 builtin-clone: use strbuf in clone_local() and copy_or_link_directory()
13500 builtin_clone: use strbuf in cmd_clone()
13502 Nanako Shiraishi (22):
13503 t/t91XX-svn: start removing use of "git-" from these tests
13504 t/t91XX git-svn tests: run "git svn" not "git-svn"
13505 t9200: use "git cvsexportcommit" without dash
13506 t9300, t9301: use "git fast-import/fast-export" without dash
13507 t9700: use "git config" without dash
13508 tests: use "git foo" without dash in strings
13509 t9101: use "git hash-object" without dash
13510 Install git-cvsserver in $(bindir)
13511 remote.c: make free_ref(), parse_push_refspec() and free_refspecs() static.
13512 graph.c: make many functions static
13513 usage.c: remove unused functions
13514 Add contrib/rerere-train script
13515 dir.c: make dir_add_name() and dir_add_ignored() static
13516 run-command.c: remove run_command_v_opt_cd()
13517 config.c: make git_parse_long() static
13518 commit.c: make read_graft_file() static
13519 archive.c: make archiver static
13521 rebase: Document --no-verify option to bypass pre-rebase hook
13522 Document "git log --source"
13523 Document "git log --simplify-by-decoration"
13524 git-gui: update Japanese translation
13527 config.mak.in: Pass on LDFLAGS from configure
13529 Nicolas Pitre (18):
13530 sha1write: don't copy full sized buffers
13531 pack-objects: don't include missing preferred base objects
13532 t5300: improve SHA1 collision test
13533 fix openssl headers conflicting with custom SHA1 implementations
13534 index-pack: rationalize delta resolution code
13535 index-pack: smarter memory usage during delta resolution
13536 fix multiple issues in index-pack
13537 improve index-pack tests
13538 index-pack: don't leak leaf delta result
13539 close another possibility for propagating pack corruption
13540 better validation on delta base object offsets
13541 make unpack_object_header() non fatal
13542 make packed_object_info() resilient to pack corruptions
13543 make check_object() resilient to pack corruptions
13544 make find_pack_revindex() aware of the nasty world
13545 pack-objects: allow "fixing" a corrupted pack without a full repack
13546 extend test coverage for latest pack corruption resilience improvements
13547 pack-objects: don't leak pack window reference when splitting packs
13550 provide more errors for the "merge into empty head" case
13552 Paul Mackerras (17):
13553 gitk: Use <Button-2> for context menus on OSX
13554 gitk: Clean up file encoding code and add enable/disable option
13555 gitk: Fix binding for <Return> in sha1 entry field
13556 gitk: New way of constructing menus that allows for Alt+letter accelerators
13557 gitk: Regenerate .po files
13558 gitk: Turn short SHA1 names into links too
13559 gitk: Fix some off-by-one errors in computing which line to blame
13560 gitk: Add a menu item to show where a given line comes from
13561 gitk: Make the background color of marked lines configurable
13562 gitk: Unify handling of merge diffs with normal 2-way diffs
13563 gitk: Make "show origin of this line" work on fake commits
13564 gitk: Cope with unmerged files in local changes
13565 gitk: Improve cherry-pick error handling
13566 gitk: Fix linehtag undefined error with file highlighting
13567 gitk: Index line[hnd]tag arrays by id rather than row number
13568 gitk: Fix switch statement in parseviewargs
13569 gitk: Show local changes properly when we have a path limit
13572 git-svn: set auto_props when renaming files
13575 contrib/hooks/post-receive-email: Put rev display in separate function
13576 contrib/hooks/post-receive-email: Make revision display configurable
13578 Peter Krefting (1):
13579 Updated Swedish translation (514t0f0u).
13581 Peter Valdemar Mørch (2):
13582 Teach git log --check to return an appropriate exit code
13583 Teach git log --exit-code to return an appropriate exit code
13586 git-web--browse: Support for using /bin/start on MinGW
13587 git-gui: Clarify the Remote -> Delete... action
13588 git-gui: Squash populate_{push,fetch}_menu to populate_remotes_menu
13589 git-gui: Add support for adding remotes
13590 git-gui: Add support for removing remotes
13591 git-gui: mkdir -p when initializing new remote repository
13592 git-gui: Use git web--browser for web browsing
13593 git-gui: Add Explore Working Copy to the Repository menu
13594 git-gui: gui.autoexplore makes explorer to pop up automatically after picking
13595 git-gui: Avoid using the term URL when specifying repositories
13596 git-gui: Make input boxes in init/clone/open dialogs consistent
13597 git-gui: Fix removing non-pushable remotes
13598 git-gui: Fix fetching from remotes when adding them
13599 gitweb: Clean-up sorting of project list
13600 gitweb: Quote non-displayable characters in hex, not octal
13601 config.c: Tolerate UTF8 BOM at the beginning of config file
13602 gitweb: Identify all summary metadata table rows
13603 gitweb: Add support for extending the action bar with custom links
13604 gitweb: Support for tag clouds
13605 gitweb: Make the by_tag filter delve in forks as well
13606 gitweb: Support for simple project search form
13607 Do not rename read-only files during a push
13609 Pierre Habouzit (8):
13610 Enable threaded delta search on *BSD and Linux.
13611 parse-opt: migrate fmt-merge-msg.
13612 parse-opt: migrate git-merge-base.
13613 parse-opt: migrate builtin-merge-file.
13614 git send-email: make the message file name more specific.
13615 git send-email: interpret unknown files as revision lists
13616 git send-email: add --annotate option
13617 git send-email: ask less questions when --compose is used.
13620 builtin-reflog: Allow reflog expire to name partial ref
13621 builtin-commit.c: show on which branch a commit was added
13622 git wrapper: also use aliases to correct mistyped commands
13625 Update RPM spec for the new location of git-cvsserver.
13627 Ralf Wildenhues (2):
13628 Correct typos in RelNotes-1.6.1
13629 Fix typos in the documentation.
13631 Raphael Zimmerer (1):
13632 git grep: Add "-z/--null" option as in GNU's grep.
13635 log: add load_ref_decorations()
13636 move load_ref_decorations() to log-tree.c and export it
13637 add '%d' pretty format specifier to show decoration
13638 add alloc_ref_with_prefix()
13639 use alloc_ref_from_str() everywhere
13640 make alloc_ref_from_str() the new alloc_ref()
13641 blame: inline get_patch()
13642 add xdi_diff_hunks() for callers that only need hunk lengths
13643 blame: use xdi_diff_hunks(), get rid of struct patch
13644 add strbuf_expand_dict_cb(), a helper for simple cases
13645 merge-recursive: use strbuf_expand() instead of interpolate()
13646 daemon: use strbuf_expand() instead of interpolate()
13647 daemon: inline fill_in_extra_table_entries()
13648 daemon: deglobalize variable 'directory'
13649 remove the unused files interpolate.c and interpolate.h
13652 gitk: Bind Key-Return to create on new branch dialog
13654 Robert Shearman (4):
13655 git-imap-send: Allow the program to be run from subdirectories of a git tree
13656 git-imap-send: Support SSL
13657 imap-send.c: style fixes
13658 Documentation: Improve documentation for git-imap-send(1)
13660 Romain Francoise (1):
13661 builtin-help: fallback to GIT_MAN_VIEWER before man
13664 bash: use for-each-ref format 'refname:short'
13665 remove vim syntax highlighting in favor of upstream
13666 bash: complete full refs
13668 Samuel Tardieu (1):
13669 Fix deletion of last character in levenshtein distance
13672 rev-list documentation: clarify the two parts of history simplification
13674 Shawn O. Pearce (7):
13675 Make reflog query '@{1219188291}' act as '@{2008.8.19.16:24:51.-0700}'
13676 git-gui: Hide commit related UI during citool --nocommit
13677 git-gui: Use gitattribute "encoding" for file content display
13678 git-gui: Assume `blame --incremental` output is in UTF-8
13679 git-gui: Show/hide "Sign Off" based on nocommitmsg option
13680 describe: Make --tags and --all match lightweight tags more often
13681 Update the po template
13683 Simon Hausmann (1):
13684 Make it possible to abort the submission of a change to Perforce
13687 Fix commit_tree() buffer leak
13688 merge-recursive.c: Add more generic merge_recursive_generic()
13690 Stephen Haberman (8):
13691 rebase--interactive: fix parent rewriting for dropped commits
13692 rebase-i-p: test to exclude commits from todo based on its parents
13693 rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEAD
13694 rebase-i-p: delay saving current-commit to REWRITTEN if squashing
13695 rebase-i-p: fix 'no squashing merges' tripping up non-merges
13696 rebase-i-p: only list commits that require rewriting in todo
13697 rebase-i-p: do not include non-first-parent commits touching UPSTREAM
13698 rebase-i-p: if todo was reordered use HEAD as the rewritten parent
13700 Stephen R. van den Berg (4):
13701 git-daemon: call logerror() instead of error()
13702 git-daemon: use LOG_PID, simplify logging code
13703 git-daemon: Simplify dead-children reaping logic
13704 git-daemon: rewrite kindergarden, new option --max-connections
13707 bash completion: Add --[no-]validate to "git send-email"
13710 filter-branch: Extend test to show rewriting bug
13711 filter-branch: fix ref rewriting with --subdirectory-filter
13712 filter-branch: use --simplify-merges
13713 Documentation: rev-list-options: move --simplify-merges documentation
13714 rev-list: fix --reverse interaction with --parents
13715 t6013: replace use of 'tac' with equivalent Perl
13716 git svn: catch lack of upstream info for dcommit earlier
13717 git svn info: tests: let 'init' test run with SVN 1.5
13718 git svn info: tests: do not use set -e
13719 git svn info: tests: use test_cmp instead of git-diff
13720 git svn info: tests: fix ptouch argument order in setup
13721 git svn info: make info relative to the current directory
13722 git svn info: always quote URLs in 'info' output
13723 git-svn: match SVN 1.5 behaviour of info' on unknown item
13724 git-svn: fix 'info' tests for unknown items
13725 Documentation: new upstream rebase recovery section in git-rebase
13726 Documentation: Refer to git-rebase(1) to warn against rewriting
13727 Documentation: remove stale howto/rebase-and-edit.txt
13728 Documentation: add manpage about workflows
13730 Tom Preston-Werner (1):
13731 connect.c: add a way for git-daemon to pass an error back to client
13733 Tommi Virtanen (1):
13734 Install git-shell in bindir, too
13736 Tor Arvid Lund (1):
13737 git-p4: Fix checkout bug when using --import-local.
13740 send-email: Fix Pine address book parsing
13743 Teach/Fix pull/fetch -q/-v options
13744 Retain multiple -q/-v occurrences in git pull
13747 Version v1.6.0.6; changes since v1.6.0.5:
13748 -----------------------------------------
13751 git-mergetool: properly handle "git mergetool -- filename"
13754 git-svn: Make following parents atomic
13757 git-config.txt: fix a typo
13759 Johannes Schindelin (2):
13760 fast-import: close pack before unlinking it
13761 fast-export: deal with tag objects that do not have a tagger
13763 Junio C Hamano (6):
13764 work around Python warnings from AsciiDoc
13765 git-show: do not segfault when showing a bad tag
13766 pager: do not dup2 stderr if it is already redirected
13767 gitweb: do not run "git diff" that is Porcelain
13769 fast-import: make tagger information optional
13771 Linus Torvalds (1):
13772 fsck: reduce stack footprint
13774 Markus Heidelberg (1):
13775 Documentation: fix typos, grammar, asciidoc syntax
13778 SubmittingPatches: mention the usage of real name in Signed-off-by: lines
13781 make sure packs to be replaced are closed beforehand
13784 git-send-email: handle email address with quoted comma
13787 Version v1.6.0.5; changes since v1.6.0.4:
13788 -----------------------------------------
13790 Alexandre Julliard (2):
13791 checkout: Don't crash when switching away from an invalid branch.
13792 git-submodule: Avoid printing a spurious message.
13794 Brandon Casey (12):
13795 t7700: demonstrate mishandling of objects in packs with a .keep file
13796 packed_git: convert pack_local flag into a bitfield and add pack_keep
13797 pack-objects: new option --honor-pack-keep
13798 repack: don't repack local objects in packs with .keep file
13799 repack: do not fall back to incremental repacking with [-a|-A]
13800 builtin-gc.c: use new pack_keep bitfield to detect .keep file existence
13801 t7700: demonstrate mishandling of loose objects in an alternate ODB
13802 sha1_file.c: split has_loose_object() into local and non-local counterparts
13803 pack-objects: extend --local to mean ignore non-local loose objects too
13804 t7700: test that 'repack -a' packs alternate packed objects
13805 repack: only unpack-unreachable if we are deleting redundant packs
13806 revision.c: use proper data type in call to sizeof() within xrealloc
13809 Fix misleading wording for git-cherry-pick
13811 Christian Couder (3):
13812 Documentation: rev-list: change a few instances of "git-cmd" to "git cmd"
13813 Documentation: bisect: change a few instances of "git-cmd" to "git cmd"
13814 Documentation: fix links to "everyday.html"
13817 Fix non-literal format in printf-style calls
13819 Davide Libenzi (1):
13820 xdiff: give up scanning similar lines early
13822 Jakub Narebski (1):
13823 gitweb: Make project specific override for 'grep' feature work
13826 Documentation: git-svn: fix example for centralized SVN clone
13829 commit: Fix stripping of patch in verbose mode.
13830 tag: delete TAG_EDITMSG only on successful tag
13833 sha1_file: avoid bogus "file exists" error message
13835 Johannes Schindelin (1):
13836 fast-export: use an unsorted string list for extra_refs
13839 compat/mingw.c: Teach mingw_rename() to replace read-only files
13841 Junio C Hamano (8):
13842 Makefile: help people who run 'make check' by mistake
13843 checkout: Fix "initial checkout" detection
13844 Start 1.6.0.5 cycle
13845 builtin-ls-files.c: coding style fix.
13846 Teach ls-files --with-tree=<tree> to work with options other than -c
13847 Teach "git diff" to honour --[no-]ext-diff
13848 Update draft release notes to 1.6.0.5
13851 Linus Torvalds (1):
13852 date/time: do not get confused by fractional seconds
13854 Martin Koegler (1):
13855 git push: Interpret $GIT_DIR/branches in a Cogito compatible way
13858 Remove the period after the git-check-attr summary
13860 Matt McCutchen (3):
13861 config.txt: alphabetize configuration sections
13862 git checkout: don't warn about unborn branch if -f is already passed
13863 "git diff <tree>{3,}": do not reverse order of arguments
13866 Add new testcase to show fast-export does not always exports all tags
13867 User's Manual: remove duplicated url at the end of Appendix B
13868 http.c: use 'git_config_string' to get 'curl_http_proxy'
13870 Nguyễn Thái Ngọc Duy (1):
13871 generate-cmdlist.sh: avoid selecting synopsis at wrong place
13874 Fix pack.packSizeLimit and --max-pack-size handling
13877 git-p4: fix keyword-expansion regex
13879 Ralf Wildenhues (1):
13880 Fix typos in the documentation.
13883 bash: remove dashed command leftovers
13884 bash: offer refs instead of filenames for 'git revert'
13887 sha1_file.c: resolve confusion EACCES vs EPERM
13889 Samuel Tardieu (2):
13890 tag: Check that options are only allowed in the appropriate mode
13891 tag: Add more tests about mixing incompatible modes and options
13894 git ls-remote: make usage string match manpage
13895 request-pull: make usage string match manpage
13898 fetch-pack: Avoid memcpy() with src==dst
13901 Version v1.6.0.4; changes since v1.6.0.3:
13902 -----------------------------------------
13905 Add mksnpath which allows you to specify the output buffer
13906 Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c
13907 Fix potentially dangerous uses of mkpath and git_path
13908 Plug a memleak in builtin-revert
13909 Add git_snpath: a .git path formatting routine with output buffer
13910 Fix potentially dangerous use of git_path in ref.c
13911 git_pathdup: returns xstrdup-ed copy of the formatted path
13912 Use git_pathdup instead of xstrdup(git_path(...))
13913 Add --verbose|-v to test-chmtime
13914 Use test-chmtime -v instead of perl in t5000 to get mtime of a file
13916 Charles Bailey (1):
13917 git-archive: work in bare repos
13919 Christian Jaeger (1):
13920 Git.pm: do not break inheritance
13922 Clemens Buchacher (2):
13923 do not force write of packed refs
13924 push: fix local refs update if already up-to-date
13927 git-svn: change dashed git-config to git config
13928 git-svn: change dashed git-commit-tree to git commit-tree
13930 Gustaf Hendeby (1):
13931 git-gui: Help identify aspell version on Windows too
13933 Jakub Narebski (1):
13934 Documentation/gitattributes: Add subsection header for each attribute
13937 Documentation: clarify information about 'ident' attribute
13940 refactor handling of "other" files in ls-files and status
13941 correct cache_entry allocation
13942 pack-objects: avoid reading uninitalized data
13943 fix overlapping memcpy in normalize_absolute_path
13944 send-pack: do not send out single-level refs such as refs/stash
13946 Johannes Schindelin (1):
13947 Fix fetch/pull when run without --update-head-ok
13950 asciidoc: add minor workaround to add an empty line after code blocks
13952 Junio C Hamano (9):
13953 pull: allow "git pull origin $something:$current_branch" into an unborn branch
13954 Fix "checkout --track -b newbranch" on detached HEAD
13955 reset --hard/read-tree --reset -u: remove unmerged new paths
13956 demonstrate breakage of detached checkout with symbolic link HEAD
13957 Enhance hold_lock_file_for_{update,append}() API
13958 Start 1.6.0.4 cycle
13959 Update draft 1.6.0.4 release notes
13960 format-patch documentation: mention the special case of showing a single commit
13963 Linus Torvalds (1):
13964 Add file delete/create info when we overflow rename_limit
13966 Markus Heidelberg (1):
13967 bash completion: add doubledash to "git show"
13969 Mikael Magnusson (1):
13970 Document that git-log takes --all-match.
13973 Fix git branch -m for symrefs.
13974 rename_ref(): handle the case when the reflog of a ref does not exist
13975 Fix git update-ref --no-deref -d.
13976 git branch -m: forbid renaming of a symref
13977 update-ref --no-deref -d: handle the case when the pointed ref is packed
13979 Nanako Shiraishi (1):
13980 Install git-cvsserver in $(bindir)
13982 Pierre Habouzit (1):
13983 git send-email: avoid leaking directory file descriptors.
13986 Update RPM spec for the new location of git-cvsserver.
13989 add -p: warn if only binary changes present
13991 Tom Preston-Werner (1):
13992 add instructions on how to send patches to the mailing list with Gmail
13994 Tommi Virtanen (1):
13995 Install git-shell in bindir, too
13998 Add reference for status letters in documentation.
14001 Version v1.6.0.3; changes since v1.6.0.2:
14002 -----------------------------------------
14004 Abhijit Bhopatkar (1):
14005 Documentation: Clarify '--signoff' for git-commit
14008 git-svn: factor out svnserve test code for later use
14009 git-svn: Always create a new RA when calling do_switch for svn://
14012 Remove empty directories in recursive merge
14013 Add remove_path: a function to remove as much as possible of a path
14014 Use remove_path from dir.c instead of own implementation
14016 Alexander Gavrilov (1):
14017 builtin-blame: Fix blame -C -C with submodules.
14019 Björn Steinbrink (1):
14020 force_object_loose: Fix memory leak
14022 Brandon Casey (14):
14023 t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()
14024 t9700/test.pl: remove File::Temp requirement
14025 diff.c: return pattern entry pointer rather than just the hunk header pattern
14026 diff.c: associate a flag with each pattern and use it for compiling regex
14027 diff.*.xfuncname which uses "extended" regex's for hunk header selection
14028 t4018-diff-funcname: test syntax of builtin xfuncname patterns
14029 builtin-prune.c: prune temporary packs in <object_dir>/pack directory
14030 git-stash.sh: don't default to refs/stash if invalid ref supplied
14031 builtin-merge.c: allocate correct amount of memory
14032 git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1)
14033 remote.c: correct the check for a leading '/' in a remote name
14034 t4018-diff-funcname: rework negated last expression test
14035 t4018-diff-funcname: demonstrate end of line funcname matching flaw
14036 xdiff-interface.c: strip newline (and cr) from line before pattern matching
14038 Charles Bailey (2):
14039 Add new test to demonstrate git archive core.autocrlf inconsistency
14040 Make git archive respect core.autocrlf when creating zip format archives
14043 Documentation: clarify the details of overriding LESS via core.pager
14046 contrib: update packinfo.pl to not use dashed commands
14048 Daniel Barkalow (1):
14049 Check early that a new branch is new and valid
14051 David Soria Parra (1):
14052 Solaris: Use OLD_ICONV to avoid compile warnings
14055 maint: check return of split_cmdline to avoid bad config strings
14056 git init: --bare/--shared overrides system/global config
14058 Dmitry Potapov (4):
14059 git-rebase-interactive: do not squash commits on abort
14060 git-rebase--interactive: auto amend only edited commit
14061 make prefix_path() never return NULL
14062 do not segfault if make_cache_entry failed
14065 completion: git commit should list --interactive
14068 git-svn: fix handling of even funkier branch names
14070 Fabrizio Chiarello (1):
14071 builtin-clone: fix typo
14074 Clarified gitattributes documentation regarding custom hunk header.
14076 Giuseppe Bilotta (1):
14077 gitweb: remove PATH_INFO from $my_url and $my_uri
14080 Start conforming code to "git subcmd" style part 3
14081 Cosmetical command name fix
14084 builtin-apply: fix typo leading to stack corruption
14086 Jakub Narebski (2):
14087 gitweb: Fix two 'uninitialized value' warnings in git_tree()
14088 gitweb: Add path_info tests to t/t9500-gitweb-standalone-no-errors.sh
14091 Makefile: do not set NEEDS_LIBICONV for Solaris 8
14092 git apply --directory broken for new files
14093 tests: shell negation portability fix
14096 gitweb: avoid warnings for commits without body
14099 for-each-ref: Fix --format=%(subject) for log message without newlines
14100 Use strchrnul() instead of strchr() plus manual workaround
14102 Johannes Schindelin (2):
14103 git rm: refresh index before up-to-date check
14104 rebase -i: do not fail when there is no commit to cherry-pick
14107 git-remote: do not use user input in a printf format string
14108 git-push.txt: Describe --repo option in more detail
14111 checkout: Do not show local changes when in quiet mode
14112 git-check-attr(1): add output and example sections
14114 Junio C Hamano (15):
14115 discard_cache: reset lazy name_hash bit
14116 diff Porcelain: do not disable auto index refreshing on -C -C
14117 diff --quiet: make it synonym to --exit-code >/dev/null
14118 Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
14119 Fix permission bits on sources checked out with an overtight umask
14120 checkout: do not lose staged removal
14121 diff/diff-files: do not use --cc too aggressively
14122 Start draft release notes for 1.6.0.3
14123 diff: use extended regexp to find hunk headers
14124 diff hunk pattern: fix misconverted "\{" tex macro introducers
14125 Update draft release notes to 1.6.0.3
14126 diff(1): clarify what "T"ypechange status means
14127 Hopefully the final draft release notes update before 1.6.0.3
14128 Fix testcase failure when extended attributes are in use
14131 Linus Torvalds (1):
14132 fix bogus "diff --git" header from "diff --no-index"
14135 git-svn: call 'fatal' correctly in set-tree
14137 Matt McCutchen (1):
14138 t1301-shared-repo.sh: don't let a default ACL interfere with the test
14140 Michael J Gruber (1):
14141 make "git remote" report multiple URLs
14143 Michael Prokop (1):
14144 Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606)
14146 Mikael Magnusson (4):
14147 Typo "bogos" in format-patch error message.
14148 git-repack uses --no-repack-object, not --no-repack-delta.
14149 Fix a few typos in relnotes
14150 Typo "does not exists" when git remote update remote.
14153 test-lib: fix color reset in say_color()
14154 Add testcase to ensure merging an early part of a branch is done properly
14156 Nanako Shiraishi (2):
14157 docs: describe pre-rebase hook
14158 Teach rebase -i to honor pre-rebase hook
14161 fix pread()'s short read in index-pack
14162 rehabilitate 'git index-pack' inside the object store
14165 Do not perform cross-directory renames when creating packs
14168 git-submodule: Fix "Unable to checkout" for the initial 'update'
14170 Rafael Garcia-Suarez (1):
14171 Clarify commit error message for unmerged files
14174 t0024: add executable permission
14175 Documentation: remove '\' in front of short options
14176 rebase -i: proper prepare-commit-msg hook argument when squashing
14177 rebase -i: remove leftover debugging
14178 bash: remove fetch, push, pull dashed form leftovers
14180 Samuel Tardieu (1):
14181 Do not use errno when pread() returns 0
14183 Shawn O. Pearce (3):
14184 Update release notes for 1.6.0.3
14185 Update release notes for 1.6.0.3
14186 test-lib: fix broken printf
14188 Stephen Haberman (1):
14189 Clarify how the user can satisfy stash's 'dirty state' check.
14192 sha1_file: link() returns -1 on failure, not errno
14194 Todd Zullinger (1):
14195 Use dashless git commands in setgitperms.perl
14198 Fix fetch/clone --quiet when stdout is connected
14201 Bust the ghost of long-defunct diffcore-pathspec.
14203 martin f. krafft (1):
14204 Improve git-log documentation wrt file filters
14207 Version v1.6.0.2; changes since v1.6.0.1:
14208 -----------------------------------------
14211 Fix use of hardlinks in "make install"
14213 Alexander Gavrilov (1):
14214 git-gui: Fix string escaping in po2msg.sh
14216 Alexandre Bourget (2):
14217 git-gui: Update french translation
14218 git-gui: update all remaining translations to French.
14220 Andreas Färber (1):
14221 Makefile: always provide a fallback when hardlinks fail
14223 Arjen Laarhoven (1):
14224 Use compatibility regex library for OSX/Darwin
14226 Ask Bjørn Hansen (1):
14227 Document sendemail.envelopesender configuration
14229 Björn Steinbrink (1):
14230 for-each-ref: Allow a trailing slash in the patterns
14232 Clemens Buchacher (2):
14233 git gui: show diffs with a minimum of 1 context line
14234 clone: fix creation of explicitly named target directory
14236 Gustaf Hendeby (1):
14237 Document clarification: gitmodules, gitattributes
14240 Start conforming code to "git subcmd" style
14241 Improve documentation for --dirstat diff option
14242 Start conforming code to "git subcmd" style part 2
14245 Fix "git log -i --grep"
14246 pretty=format: respect date format options
14247 checkout: fix message when leaving detached HEAD
14248 Use compatibility regex library also on FreeBSD
14251 Bring local clone's origin URL in line with that of a remote clone
14254 Use compatibility regex library also on AIX
14257 Fix passwd(5) ref and reflect that commit doens't use commit-tree
14259 Junio C Hamano (17):
14260 ctype.c: protect tiny C preprocessor constants
14261 shell: do not play duplicated definition games to shrink the executable
14262 Fix example in git-name-rev documentation
14263 git-apply: Loosen "match_beginning" logic
14264 checkout: do not check out unmerged higher stages randomly
14265 gitattributes: -crlf is not binary
14266 diff: Help "less" hide ^M from the output
14267 'git foo' program identifies itself without dash in die() messages
14268 Start 1.6.0.2 maintenance cycle
14269 diff --cumulative is a sub-option of --dirstat
14270 log --author/--committer: really match only with name part
14271 "blame -c" should be compatible with "annotate"
14272 Mention the fact that 'git annotate' is only for backward compatibility.
14273 stash: refresh the index before deciding if the work tree is dirty
14274 Update draft release notes for 1.6.0.2
14275 Update draft release notes for 1.6.0.2
14278 Linus Torvalds (2):
14279 index-pack: be careful after fixing up the header/footer
14280 Fix '--dirstat' with cross-directory renaming
14283 Git.pm: Use File::Temp->tempfile instead of ->new
14284 git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl
14287 Makefile: add merge_recursive.h to LIB_H
14288 t7501: always use test_cmp instead of diff
14290 Nanako Shiraishi (4):
14291 tests: use "git xyzzy" form (t0000 - t3599)
14292 tests: use "git xyzzy" form (t3600 - t6999)
14293 tests: use "git xyzzy" form (t7000 - t7199)
14294 tests: use "git xyzzy" form (t7200 - t9001)
14296 Nguyễn Thái Ngọc Duy (6):
14297 index-pack: setup git repository
14298 diff*: fix worktree setup
14299 grep: fix worktree setup
14300 read-tree: setup worktree if merge is required
14301 update-index: fix worktree setup
14302 setup_git_directory(): fix move to worktree toplevel directory
14305 discard revindex data when pack list changes
14306 pack-objects: improve returned information from write_one()
14307 improve reliability of fixup_pack_header_footer()
14308 pack-objects: use fixup_pack_header_footer()'s validation mode
14309 index-pack: use fixup_pack_header_footer()'s validation mode
14310 fixup_pack_header_footer(): use nicely aligned buffer sizes
14311 improve handling of sideband message display
14314 make git-shell paranoid about closed stdin/stdout/stderr
14316 Paolo Ciarrocchi (1):
14317 tutorial: gentler illustration of Alice/Bob workflow using gitk
14320 bash completion: Hide more plumbing commands
14322 Ralf Wildenhues (1):
14323 Fix some manual typos.
14325 Ramsay Allan Jones (2):
14326 Fix a warning (on cygwin) to allow -Werror
14327 Suppress some bash redirection error messages
14330 Documentation: fix reference to a for-each-ref option
14331 Documentation: fix disappeared lines in 'git stash' manpage
14332 Documentation: minor cleanup in a use case in 'git stash' manual
14334 Shawn O. Pearce (2):
14335 pack-objects: Allow missing base objects when creating thin packs
14336 git-gui: Fix diff parsing for lines starting with "--" or "++"
14339 config.txt: Add missing colons after option name
14342 Document gitk --argscmd flag.
14345 Version v1.6.0.1; changes since v1.6.0:
14346 ---------------------------------------
14348 Alexander Gavrilov (1):
14349 Respect core.autocrlf in combined diff
14352 t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0'
14353 revision.h: make show_early_output an extern which is defined in revision.c
14354 compat/snprintf.c: handle snprintf's that always return the # chars transmitted
14357 mailinfo: re-fix MIME multipart boundary parsing
14360 Completion: add missing '=' for 'diff --diff-filter'
14363 git-svn: fix dcommit to urls with embedded usernames
14366 mailinfo: avoid violating strbuf assertion
14367 decorate: allow const objects to be decorated
14370 git format-patch: avoid underrun when format.headers is empty or all NLs
14371 remote.c: remove useless if-before-free test
14374 Install templates with the user and group of the installing personality
14376 Jonathan Nieder (2):
14377 Documentation: clarify pager.<cmd> configuration
14378 Documentation: clarify pager configuration
14380 Junio C Hamano (9):
14381 Start 1.6.0.X maintenance series
14382 diff --check: do not get confused by new blank lines in the middle
14383 for-each-ref: cope with tags with incomplete lines
14384 completion: find out supported merge strategies correctly
14385 "git-merge": allow fast-forwarding in a stat-dirty tree
14386 Update draft release notes for 1.6.0.1
14387 unpack_trees(): protect the handcrafted in-core index from read_cache()
14388 merge: fix numerus bugs around "trivial merge" area
14392 Fix 'git help help'
14393 Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UX
14395 Robert Schiele (1):
14396 adapt git-cvsserver manpage to dash-free syntax
14398 Simon Hausmann (1):
14399 Clean up the git-p4 documentation
14401 Tarmigan Casebolt (1):
14402 Add hints to revert documentation about other ways to undo changes
14404 Tor Arvid Lund (1):
14405 git-p4: Fix one-liner in p4_write_pipe function.
14408 Version v1.6.0; changes since v1.6.0-rc3:
14409 -----------------------------------------
14412 Fix t3700 on filesystems which do not support question marks in names
14414 Alexander Gavrilov (1):
14415 gitk: Allow safely calling nukefile from a run queue handler
14418 Create a specific version of the read_pipe_lines command for p4 invocations
14419 Utilise the new 'p4_read_pipe_lines' command
14420 Have a command that specifically invokes 'p4' (via system)
14421 Utilise the new 'p4_system' function.
14422 Add a single command that will be used to construct the 'p4' command
14423 If we are in verbose mode, output what we are about to run (or return)
14424 Switch to using 'p4_build_cmd'
14425 If the user has configured various parameters, use them.
14426 Consistently use 'git-p4' for the configuration entries
14427 Move git-p4.syncFromOrigin into a configuration parameters section
14428 Put some documentation in about the parameters that have been added
14429 Put in the two other configuration elements found in the source
14430 Add p4 read_pipe and write_pipe wrappers
14431 Utilise our new p4_read_pipe and p4_write_pipe wrappers
14434 test-parse-options: use appropriate cast in length_callback
14435 t5304-prune: adjust file mtime based on system time rather than file mtime
14438 Makefile: building git in cygwin 1.7.0
14441 bash completion: 'git apply' should use 'fix' not 'strip'
14443 Junio C Hamano (1):
14447 Fix escaping of glob special characters in pathspecs
14450 bash completion: Add completion for 'git mergetool'
14451 bash completion: Add '--merge' long option for 'git log'
14454 bash-completion: Add non-command git help files to bash-completion
14455 Git.pm: Make File::Spec and File::Temp requirement lazy
14457 Matt McCutchen (1):
14458 git format-patch documentation: clarify what --cover-letter does
14461 Documentation: document the pager.* configuration setting
14462 t9300: replace '!' with test_must_fail
14465 git-p4: chdir now properly sets PWD environment variable in msysGit
14467 Shawn O. Pearce (1):
14471 git-am: ignore --binary option
14472 git-stash: improve synopsis in help and manual page
14473 Improve error output of git-rebase
14476 rebase -i -p: handle index and workdir correctly
14477 rebase -i -p: fix parent rewriting
14480 Version v1.6.0-rc3; changes since v1.6.0-rc2:
14481 ---------------------------------------------
14484 Makefile: set SHELL to value of SHELL_PATH
14485 Makefile: add a target which will abort compilation with ancient shells
14488 git-svn: add ability to specify --commit-url for dcommit
14489 git-svn: wrap long lines in a few places
14491 Francis Moreau (1):
14492 git-bisect: fix wrong usage of read(1)
14494 Gustaf Hendeby (2):
14495 gitattributes: Document built in hunk header patterns
14496 Teach git diff about BibTeX head hunk patterns
14498 Ivan Stankovic (1):
14499 Documentation: fix invalid reference to 'mybranch' in user manual
14501 Johannes Schindelin (1):
14502 clone --mirror: avoid storing repeated tags
14504 Jonathan Nieder (1):
14505 Documentation: user-manual: "git commit -a" doesn't motivate .gitignore
14507 Junio C Hamano (9):
14508 asciidoc markup fixes
14509 GIT-VERSION-GEN: mark the version 'dirty' only if there are modified files
14510 mailinfo: fix MIME multi-part message boundary handling
14511 Update draft RelNotes for 1.6.0
14512 Fix deleting reflog entries from HEAD reflog
14513 Re-fix rev-list-options documentation
14514 diff --check: do not unconditionally complain about trailing empty lines
14515 Do not talk about "diff" in rev-list documentation.
14519 Fix multi-glob assertion in git-svn
14520 git-svn: Allow deep branch names by supporting multi-globs
14521 Git.pm: Add faculties to allow temp files to be cached
14522 git-svn: Make it incrementally faster by minimizing temp files
14523 git-svn: Reduce temp file usage when dealing with non-links
14525 Nguyễn Thái Ngọc Duy (1):
14526 Fix typo in comments of longest_ancestor_length()
14529 Fail properly when cloning from invalid HTTP URL
14530 Adjust for the new way of enabling the default post-update hook
14533 builtin-rm: Add a --force flag
14534 reflog test: add more tests for 'reflog delete'
14537 bash: remove redundant check for 'git stash apply' options
14539 Stephen R. van den Berg (1):
14540 git-daemon: SysV needs the signal handler reinstated.
14543 Documentation: commit-tree: remove 16 parents restriction
14544 Documentation: filter-branch: document how to filter all refs
14545 filter-branch: be more helpful when an annotated tag changes
14546 Documentation: rev-list-options: Fix -g paragraph formatting
14547 Documentation: rev-list-options: Fix a typo
14548 Documentation: rev-list-options: Rewrite simplification descriptions for clarity
14551 Version v1.6.0-rc2; changes since v1.6.0-rc1:
14552 ---------------------------------------------
14554 Abhijit Menon-Sen (7):
14555 `git submodule add` now requires a <path>
14556 Make it clear that push can take multiple refspecs
14557 Make the DESCRIPTION match <x>... items in the SYNOPSIS
14558 Git.pm: localise $? in command_close_bidi_pipe()
14559 Fix hash slice syntax error
14560 Fix typo in perl/Git.pm
14561 Fix typos in INSTALL
14564 Make use of stat.ctime configurable
14566 Alexander Gavrilov (9):
14567 git-gui: Fix the Remote menu separator.
14568 git-gui: Preserve scroll position on reshow_diff.
14569 Support copy and rename detection in fast-export.
14570 gitk: Kill back-end processes on window close
14571 gitk: Arrange to kill diff-files & diff-index on quit
14572 gitk: On Windows, use a Cygwin-specific flag for kill
14573 gitk: Fixed broken exception handling in diff
14574 gitk: Fixed automatic row selection during load
14575 gitk: Fallback to selecting the head commit upon load
14577 Anders Melchiorsen (4):
14578 Advertise the ability to abort a commit
14579 Documentation: fix diff.external example
14580 Flush output in start_async
14581 Add output flushing before fork()
14583 Avery Pennarun (2):
14584 Teach "git diff -p" Pascal/Delphi funcname pattern
14585 git-svn: Abort with an error if 'fetch' parameter is invalid.
14588 t/t4202-log.sh: add newline at end of file
14589 Teach fsck and prune that tmp_obj_ file names may not be 14 bytes long
14590 perl/Makefile: handle paths with spaces in the NO_PERL_MAKEMAKER section
14592 Brian Gernhardt (1):
14593 Documentation: Remove mentions of git-svnimport.
14595 Cesar Eduardo Barros (1):
14596 Documentation/git-rev-parse.txt: update for new git-describe output format
14598 Christian Couder (2):
14599 merge-base: die with an error message if not passed a commit ref
14600 documentation: user-manual: update "using-bisect" section
14602 Christian Stimming (2):
14603 git-gui: Update German translation
14604 gitk: Updated German translation
14606 Ciaran McCreesh (1):
14607 Make git-add -i accept ranges like 7-
14609 David D. Kilzer (1):
14610 Fix race condition in t9119-git-svn-info.sh
14612 Dmitry Potapov (1):
14613 correct access right for git-svn-dcommit test
14616 git-svn: properly set path for "info" command
14617 t9119: conditionally re-enable test depending on svn(1) version
14619 Giuseppe Bilotta (2):
14620 diff: add ruby funcname pattern
14621 diff: chapter and part in funcname for tex
14624 init: handle empty "template" parameter
14625 Compact commit template message
14626 init: handle empty "template" parameter
14629 git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout.
14631 Johannes Schindelin (3):
14632 sort_in_topological_order(): avoid setting a commit flag
14633 clone: Add an option to set up a mirror
14634 clone --bare: Add ".git" suffix to the directory name to clone into
14637 git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core'
14640 Fix reference to Everyday Git, which is an HTML document and not a man page.
14642 Jonathan Nieder (1):
14643 git-diff(1): "--c" -> "--cc" typo fix
14645 Junio C Hamano (19):
14646 Allow building without any git installed
14647 Allow installing in the traditional way
14648 ls-tree documentation: enhance notes on subdirectory and pathspec behaviour
14649 Documentation: clarify what is shown in "git-ls-files -s" output
14650 t7001: fix "git mv" test
14651 Teach gitlinks to ie_modified() and ce_modified_check_fs()
14652 Fix merge name generation in "merge in C"
14653 Fix test-parse-options "integer" test
14654 Teach --find-copies-harder to "git blame"
14655 make sure parsed wildcard refspec ends with slash
14656 Documentation: clarify diff --cc
14657 Update my e-mail address
14658 Start 1.5.6.5 RelNotes to describe accumulated fixes
14659 builtin-name-rev.c: split deeply nested part from the main function
14660 RelNotes 1.5.6.5 updates
14661 fix diff-tree --stdin documentation
14662 Files given on the command line are relative to $cwd
14667 format-patch: Produce better output with --inline or --attach
14670 bash completion: remove unused function _git_diff_tree
14671 bash completion: Add more long options for 'git log'
14672 bash completion: Add completion for 'git grep'
14673 bash completion: Add completion for 'git clone'
14674 bash completion: Add completion for 'git clean'
14675 bash completion: Add completion for 'git init'
14676 bash completion: Add completion for 'git revert'
14677 bash completion: More completions for 'git stash'
14678 bash completion: Add completion for 'git archive'
14679 bash completion: Add completion for 'git ls-files'
14680 bash completion: Add completion for 'git mv'
14682 Linus Torvalds (1):
14683 diff.renamelimit is a basic diff configuration
14685 Michele Ballabio (2):
14686 git-gui: update po/it.po
14687 git-gui: add a part about format strings in po/README
14689 Mikael Magnusson (2):
14690 git-gui: Update swedish translation.
14691 gitk: Update swedish translation.
14694 Documentation: typos / spelling fixes in older RelNotes
14695 Documentation: typos / spelling fixes
14697 Nanako Shiraishi (1):
14698 git-gui: update Japanese translation
14701 builtin-verify-tag: fix -v option parsing
14703 Pierre Habouzit (2):
14704 Allow "non-option" revision options in parse_option-enabled commands
14705 git-submodule: move ill placed shift.
14708 git-name-rev: allow --name-only in combination with --stdin
14711 archive: allow --exec and --remote without equal sign
14712 git-name-rev: don't use printf without format
14714 Shawn O. Pearce (2):
14715 git-gui: Fix gitk search in $PATH to work on Windows
14716 git-gui: Update git-gui.pot for 0.11 nearing release
14718 Steffen Prohaska (6):
14719 Refactor, adding prepare_git_cmd(const char **argv)
14720 run-command (Windows): Run dashless "git <cmd>"
14721 git-gui: Correct installation of library to be $prefix/share
14722 git-gui (Windows): Switch to relative discovery of oguilib
14723 git-gui (Windows): Change wrapper to execdir 'libexec/git-core'
14724 Modify mingw_main() workaround to avoid link errors
14727 builtin-revert.c: typofix
14730 Propagate -u/--upload-pack option of "git clone" to transport.
14733 Optimize sha1_object_info for loose objects, not concurrent repacks
14735 Todd Zullinger (1):
14736 Replace uses of "git-var" with "git var"
14739 Version v1.6.0-rc1; changes since v1.6.0-rc0:
14740 ---------------------------------------------
14742 Abhijit Menon-Sen (2):
14743 git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core
14744 Clarify that "git log x.c y.h" lists commits that touch either file
14747 Allow pager of diff command be enabled/disabled
14749 Alexander Gavrilov (4):
14750 Fix pre-commit hooks under MinGW/MSYS
14751 Add options to control the search for copies in blame.
14752 Kill the blame back-end on window close.
14753 Add a menu item to invoke full copy detection in blame.
14755 Anders Melchiorsen (1):
14756 Documentation: fix diff.external example
14758 Björn Steinbrink (2):
14759 index-pack.c: correctly initialize appended objects
14760 rev-parse: Add support for the ^! and ^@ syntax
14763 git-svn: teach dcommit about svn auto-props
14766 t/: Replace diff [-u|-U0] with test_cmp to allow compilation with old diff
14767 t4116-apply-reverse.sh: use $TAR rather than tar
14768 t3200,t7201: replace '!' with test_must_fail
14769 t7502-commit.sh: rearrange test to make more portable
14770 t/t4202-log.sh: add newline at end of file
14771 Teach fsck and prune about the new location of temporary objects
14772 perl/Makefile: update NO_PERL_MAKEMAKER section
14774 Cesar Eduardo Barros (1):
14775 Documentation/git-submodule.txt: fix doubled word
14777 Daniel Barkalow (1):
14778 In perforce, RCS keywords are case-sensitive
14780 Jakub Narebski (1):
14781 gitweb: More about how gitweb gets 'owner' of repository
14783 Johannes Schindelin (9):
14784 Rename .git/rebase to .git/rebase-apply
14785 Rename path_list to string_list
14786 Fix two leftovers from path_list->string_list
14787 Ignore dirty submodule states in "git pull --rebase"
14788 Add test to show that show-branch misses out the 8th column
14789 sort_in_topological_order(): avoid setting a commit flag
14790 builtin-commit: Two trivial style-cleanups
14791 git daemon: avoid waking up too often
14792 Avoid chdir() in list_commands_in_dir()
14794 Johannes Sixt (12):
14795 rebase -i: When an 'edit' stops, mention the commit
14796 Makefile: Do not install a copy of 'git' in $(gitexecdir)
14797 Makefile: Normalize $(bindir) and $(gitexecdir) before comparing
14798 Record the command invocation path early
14799 Fix relative built-in paths to be relative to the command invocation
14800 Allow the built-in exec path to be relative to the command invocation path
14801 Allow add_path() to add non-existent directories to the path
14802 Windows: Make $(gitexecdir) relative
14803 Windows: Make sure argv[0] has a path
14804 Windows: Do not compile git-shell
14805 git-gui: Fix "Stage/Unstage Line" with one line of context.
14806 git-gui: "Stage Line": Treat independent changes in adjacent lines better
14808 Jonathan Nieder (3):
14809 git-diff(1): "--c" -> "--cc" typo fix
14810 document that git-tag can tag more than heads
14811 t6030 (bisect): work around Mac OS X "ls"
14813 Junio C Hamano (13):
14814 Update my e-mail address
14815 Revert "make git-status use a pager"
14816 tests: do not rely on external "patch"
14817 stash save: fix parameter handling
14818 builtin-branch.c: remove unused code in append_ref() callback function
14819 builtin-branch.c: optimize --merged and --no-merged
14820 Documentation: clarify diff --cc
14821 ignore non-existent refs in dwim_log()
14822 tests: propagate $(TAR) down from the toplevel Makefile
14823 Makefile: fix shell quoting
14824 Documentation: clarify how to disable elements in core.whitespace
14825 make sure parsed wildcard refspec ends with slash
14829 builtin-branch: remove duplicated code
14830 builtin-branch: factor out merge_filter matching
14831 builtin-branch: fix -v for --[no-]merged
14834 bash completion: Add long options for 'git rm'
14835 bash completion: Add completion for 'git help'
14838 builtin-merge: give a proper error message for invalid strategies in config
14839 t7601: extend the 'merge picks up the best result' test
14841 Nikolaj Schumacher (1):
14842 Don't cut off last character of commit descriptions.
14845 git-am: remove dash from help message
14846 parse-options: fix segmentation fault when a required value is missing
14847 git am --skip: clean the index while preserving local changes
14848 update test case to protect am --skip behaviour
14851 svnimport: newer libsvn wants us to ask for the root with "", not "/"
14853 Peter Valdemar Mørch (1):
14854 send-email: find body-encoding correctly
14857 git-filter-branch.sh: Allow running in bare repositories
14858 Documentation/git-filter-branch: teach "rm" instead of "update-index --remove"
14859 git-mv: Remove dead code branch
14860 git-mv: Keep moved index entries inact
14862 Philippe Bruhat (1):
14863 mailinfo: better parse email adresses containg parentheses
14865 Pierre Habouzit (4):
14866 builtin-merge: add missing structure initialization
14867 git-submodule: move ill placed shift.
14868 git-checkout: fix command line parsing.
14869 git-checkout: improve error messages, detect ambiguities.
14872 archive: add write_archive()
14873 archive: move parameter parsing code to archive.c
14874 archive: define MAX_ARGS where it's needed
14875 archive: declare struct archiver where it's needed
14876 archive: allow --exec and --remote without equal sign
14879 checkout: mention '--' in the docs
14880 bash: offer only paths after '--' for 'git checkout'
14882 Shawn O. Pearce (2):
14883 git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk
14884 fsck: Don't require tmp_obj_ file names are 14 bytes in length
14887 git-am: Add colon before the subject that is printed out as being applied
14888 am --abort: Add to bash-completion and mention in git-rerere documentation
14889 Make non-static functions, that may be static, static
14890 Move launch_editor() from builtin-tag.c to editor.c
14891 editor.c: Libify launch_editor()
14892 git-am: Mention --abort in usage string part of OPTIONS_SPEC
14893 git-reset: Let -q hush "locally modified" messages
14896 Propagate -u/--upload-pack option of "git clone" to transport.
14897 Remove references to git-fetch-pack from "git clone" documentation.
14900 git-completion.bash: provide completion for 'show-branch'
14901 bash completion: Add long options for 'git describe'
14904 Version v1.6.0-rc0; changes since v1.5.6.6:
14905 -------------------------------------------
14907 Abhijit Menon-Sen (4):
14908 git-gui: Move on to the next filename after staging/unstaging a change
14909 git-gui: Don't select the wrong file if the last listed file is staged.
14910 Implement "git stash branch <newbranch> <stash>"
14911 Add a test for "git stash branch"
14914 Move read_revisions_from_stdin from builtin-rev-list.c to revision.c
14915 Teach git-bundle to read revision arguments from stdin like git-rev-list.
14918 Fix use of "perl -i" on Windows
14920 Alexander Gavrilov (3):
14921 Avoid rescanning unchanged entries in search for copies.
14922 Do not try to detect move/copy for entries below threshold.
14923 Support gitlinks in fast-import.
14925 Avery Pennarun (1):
14926 Reword "your branch has diverged..." lines to reduce line length
14929 t7701-repack-unpack-unreachable.sh: check timestamp of unpacked objects
14931 Brian Gernhardt (4):
14932 Fix t4017-diff-retval for white-space from wc
14933 Add test results directory to t/.gitignore
14934 Documentation: Point to gitcli(7) from git(1)
14935 Documentation: mention ORIG_HEAD in am, merge, and rebase
14937 Christian Couder (2):
14938 help: check early if we have a command, if not try a documentation topic
14939 Fix "config_error_nonbool" used with value instead of key
14941 Ciaran McCreesh (1):
14942 Make git-add -i accept ranges like 7-
14944 Cristian Peraferrer (1):
14945 Print errno upon failure to open the COMMIT_EDITMSG file
14947 Daniel Barkalow (1):
14948 Only use GIT_CONFIG in "git config", not other programs
14951 Implement normalize_absolute_path
14952 Fold test-absolute-path into test-path-utils
14953 Add support for GIT_CEILING_DIRECTORIES
14954 Eliminate an unnecessary chdir("..")
14956 Dmitry Kakurin (1):
14957 Fixed text file auto-detection: treat EOF character 032 at the end of file as printable
14959 Dmitry Potapov (4):
14960 update-hook-example: optionally allow non-fast-forward
14961 shrink git-shell by avoiding redundant dependencies
14962 completion.bash: add 'skip' and 'run' to git-bisect
14963 git-svn: fix git svn info to work without arguments
14966 git-apply: handle a patch that touches the same path more than once better
14969 user-manual: typo and grammar fixes
14970 Documentation: fix broken "linkgit" links
14973 Documentation: tweak use case in "git stash save --keep-index"
14974 completion: add branch options --contains --merged --no-merged
14975 Teach lookup_prog not to select directories
14978 t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory"
14981 Testsuite: Unset CVS_SERVER
14982 testsuite for cvs co -c
14984 Frederik Schwarzer (1):
14988 tutorial: use prompt with user names in example, to clarify who is doing what
14990 Jakub Narebski (4):
14991 gitweb: Separate filling list of projects info
14992 gitweb: Separate generating 'sort by' table header
14993 t/README: Add 'Skipping Tests' section below 'Running Tests'
14994 gitweb: Describe projects_index format in more detail
14997 fix whitespace violations in test scripts
14998 mask necessary whitespace policy violations in test scripts
14999 avoid whitespace on empty line in automatic usage message
15000 avoid trailing whitespace in zero-change diffstat lines
15001 enable whitespace checking of test scripts
15002 clone: create intermediate directories of destination repo
15003 improve for-each-ref test script
15004 Allow per-command pager config
15005 avoid null SHA1 in oldest reflog
15008 Add 'git-p4.allowSubmit' to git-p4
15011 Incorporate fetched packs in future object traversal
15012 Move pack_refs() and friends into libgit
15013 Prepare testsuite for a "git clone" that packs refs
15014 Teach "git clone" to pack refs
15016 Johannes Schindelin (12):
15017 Windows: always chmod(, 0666) before unlink().
15018 commit-tree: lift completely arbitrary limit of 16 parents
15019 Allow git-apply to recount the lines in a hunk (AKA recountdiff)
15020 Add another fast-import example, this time for .zip files
15021 Teach "git apply" to prepend a prefix with "--root=<root>"
15022 git fetch-pack: do not complain about "no common commits" in an empty repo
15023 Allow cherry-picking root commits
15024 Convert CR/LF to LF in tag signatures
15025 Move MERGE_RR from .git/rr-cache/ into .git/
15026 git-gui: MERGE_RR lives in .git/ directly with newer Git versions
15027 shortlog: support --pretty=format: option
15028 Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"
15030 Johannes Sixt (38):
15031 Add compat/regex.[ch] and compat/fnmatch.[ch].
15032 Compile some programs only conditionally.
15033 Add target architecture MinGW.
15034 Windows: Use the Windows style PATH separator ';'.
15035 setup.c: Prepare for Windows directory separators.
15036 Windows: Treat Windows style path names.
15037 Windows: Handle absolute paths in safe_create_leading_directories().
15038 Windows: Strip ".exe" from the program name.
15039 Windows: Implement a wrapper of the open() function.
15040 Windows: A minimal implemention of getpwuid().
15041 Windows: Work around misbehaved rename().
15042 Make my_mktime() public and rename it to tm_to_time_t()
15043 Windows: Implement gettimeofday().
15044 Windows: Fix PRIuMAX definition.
15045 Windows: Implement setitimer() and sigaction().
15046 Windows: Wrap execve so that shell scripts can be invoked.
15047 Windows: A pipe() replacement whose ends are not inherited to children.
15048 Windows: Implement start_command().
15049 Windows: A rudimentary poll() emulation.
15050 Windows: Disambiguate DOS style paths from SSH URLs.
15051 Windows: Implement asynchronous functions as threads.
15052 Windows: Work around incompatible sort and find.
15053 Windows: Implement wrappers for gethostbyname(), socket(), and connect().
15054 Windows: Implement a custom spawnve().
15055 Windows: Add a custom implementation for utime().
15056 Windows: Use a customized struct stat that also has the st_blocks member.
15057 Turn builtin_exec_path into a function.
15058 Windows: Compute the fallback for exec_path from the program invocation.
15059 Windows: Use a relative default template_dir and ETC_GITCONFIG
15060 When installing, be prepared that template_dir may be relative.
15061 Windows: Make the pager work.
15062 Windows: Work around an oddity when a pipe with no reader is written to.
15063 Windows: Make 'git help -a' work.
15064 Windows: TMP and TEMP environment variables specify a temporary directory.
15065 git-gui: Implement "Stage/Unstage Line"
15066 t4127-apply-same-fn: Avoid sed -i
15067 Provide fallback definitions of PRIu32 and PRIx32
15068 builtin-clone: rewrite guess_dir_name()
15070 Jonathan Nieder (23):
15071 Documentation: don't assume git-sh-setup and git-parse-remote are in PATH
15072 Documentation: fix links to tutorials and other new manual pages
15073 whitespace fix in Documentation/git-repack.txt
15074 Documentation: complicate example of "man git-command"
15075 git-daemon(1): don't assume git-daemon is in /usr/bin
15076 Documentation: prepare to be consistent about "git-" versus "git "
15077 Documentation: be consistent about "git-" versus "git "
15078 Documentation formatting and cleanup
15079 git-format-patch(1): fix stray \ in output
15080 Documentation: fix gitlinks
15081 manpages: fix bogus whitespace
15083 git-commit(1): depersonalize description
15084 Documentation: rewrap to prepare for "git-" vs "git " change
15085 Documentation: more "git-" versus "git " changes
15086 gitdiffcore(7): fix awkward wording
15087 manpages: italicize command names in synopses
15088 manpages: italicize command names
15089 manpages: italicize git command names (which were in teletype font)
15090 manpages: italicize gitk's name (where it was in teletype font)
15091 manpages: italicize nongit command names (if they are in teletype font)
15092 manpages: italicize git subcommand names (which were in teletype font)
15093 manpages: use teletype font for sample command lines
15096 git-svn: find-rev and rebase for SVN::Mirror repositories
15098 Junio C Hamano (65):
15099 revision traversal: --children option
15100 rev-list --children
15101 builtin-blame.c: move prepare_final() into a separate function.
15102 builtin-blame.c: allow more than 16 parents
15103 git-blame --reverse
15104 rerere: rerere_created_at() and has_resolution() abstraction
15105 git-rerere: detect unparsable conflicts
15106 rerere: remove dubious "tail_optimization"
15107 t4200: fix rerere test
15109 git-shell: accept "git foo" form
15110 Prepare execv_git_cmd() for removal of builtins from the filesystem
15111 pre-rebase hook update
15112 Ship sample hooks with .sample suffix
15113 Keep some git-* programs in $(bindir)
15114 Start draft release notes for 1.6.0
15115 diff --check: explain why we do not care whether old side is binary
15116 check_and_emit_line(): rename and refactor
15117 checkdiff: pass diff_options to the callback
15118 Teach "diff --check" about new blank lines at end
15119 diff --check: detect leftover conflict markers
15120 Update sample pre-commit hook to use "diff --check"
15121 Document the double-dash "rev -- path" disambiguator
15122 t9700: skip when Test::More is not available
15123 Update draft release notes for 1.6.0
15124 Introduce get_merge_bases_many()
15125 Introduce reduce_heads()
15126 Update draft release notes for 1.6.0
15127 apply --root: thinkofix.
15128 Refactor "tracking statistics" code used by "git checkout"
15129 git-status: show the remote tracking statistics
15130 git-branch -v: show the remote tracking statistics
15131 fast-export --export-marks: fix off by one error
15132 stat_tracking_info(): clear object flags used during counting
15133 branch -r -v: do not spit out garbage
15134 git-apply --directory: make --root more similar to GNU diff
15135 Update draft release notes for 1.6.0
15136 Teach "am" and "rebase" to mark the original position with ORIG_HEAD
15137 Tone down warning about GNU Interactive Tools
15138 Documentation: update sections on naming revisions and revision ranges
15139 branch --contains: default to HEAD
15140 branch --merged/--no-merged: allow specifying arbitrary commit
15141 apply: fix copy/rename breakage
15142 Teach merge.log to "git-merge" again
15143 Update draft release notes for 1.6.0
15144 reduce_heads(): protect from duplicate input
15145 git-rebase: report checkout failure
15146 tutorial: clarify "pull" is "fetch + merge"
15147 Update draft release notes to 1.6.0
15148 t/aggregate-results: whitespace fix
15149 Update draft release notes for 1.6.0
15150 read-cache.c: typofix
15151 mailinfo: off-by-one fix for [PATCH (foobar)] removal from Subject: line
15152 rerere.autoupdate: change the message when autoupdate is in effect
15153 builtin-remote.c: fix earlier "skip_prefix()" conversion
15154 t9001 (send-email): Do not use hardcoded /bin/sh in test
15156 Getting closer to 1.6.0-rc0
15157 builtin-add.c: restructure the code for maintainability
15158 git-add --all: add all files
15159 git-add --all: tests
15160 git-add --all: documentation
15161 Link shell with compat layer functions
15162 Move read_in_full() and write_in_full() to wrapper.c
15163 "needs update" considered harmful
15165 Karl Hasselström (2):
15166 Clean up builtin-update-ref's option parsing
15167 Make old sha1 optional with git update-ref -d
15170 git-send-email: Accept fifos as well as files
15172 Lars Noschinski (3):
15173 cvsserver: Add support for packed refs
15174 cvsserver: Add cvs co -c support
15175 cvsserver: Add testsuite for packed refs
15178 test-lib.sh: add --long-tests option
15179 t/test-lib.sh: add test_external and test_external_without_stderr
15180 Git.pm: add test suite
15181 gitweb: standarize HTTP status codes
15182 test-lib.sh: show git init output when in verbose mode
15183 GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copy
15185 Linus Torvalds (1):
15186 Shrink the git binary a bit by avoiding unnecessary inline functions
15188 Lukas Sandström (4):
15189 Add a helper script to send patches with Mozilla Thunderbird
15190 Make some strbuf_*() struct strbuf arguments const.
15191 Add some useful functions for strbuf manipulation.
15192 git-mailinfo: use strbuf's instead of fixed buffers
15194 Marius Storm-Olsen (4):
15195 Add an optional <mode> argument to commit/status -u|--untracked-files option
15196 Add argument 'no' commit/status option -u|--untracked-files
15197 Add configuration option for default untracked files mode
15198 Windows: Add a new lstat and fstat implementation based on Win32 API.
15201 install-doc-quick - use git --exec-path to find git-sh-setup
15202 git-submodule - make "submodule add" more strict, and document it
15203 git-submodule - register submodule URL if adding in place
15205 Michele Ballabio (3):
15206 t9301-fast-export.sh: Remove debug line
15207 builtin-merge.c: Fix option parsing
15208 builtin-push.c: Cleanup - use OPT_BIT() and remove some variables
15211 Catch failures from t5540-http-push
15213 Skip t5540-http-push test when USE_CURL_MULTI is undefined
15214 Avoid apache complaining about lack of server's FQDN
15217 We need to check for msys as well as Windows in add--interactive.
15220 A simple script to parse the results from the testcases
15221 Move split_cmdline() to alias.c
15222 Move commit_list_count() to commit.c
15223 Move parse-options's skip_prefix() to git-compat-util.h
15224 Add new test to ensure git-merge handles pull.twohead and pull.octopus
15225 Move read_cache_unmerged() to read-cache.c
15226 git-fmt-merge-msg: make it usable from other builtins
15227 Introduce get_octopus_merge_bases() in commit.c
15228 Add new test to ensure git-merge handles more than 25 refs.
15229 Add new test case to ensure git-merge reduces octopus parents when possible
15230 Retire 'stupid' merge strategy
15231 INSTALL: Update section about git-frotz form.
15232 hg-to-git: avoid raising a string exception
15233 hg-to-git: abort if the project directory is not a hg repo
15234 hg-to-git: rewrite "git-frotz" to "git frotz"
15235 hg-to-git: use git init instead of git init-db
15236 Add new test case to ensure git-merge prepends the custom merge message
15237 git-commit-tree: make it usable from other builtins
15238 Fix t7601-merge-pull-config.sh on AIX
15240 t0001-init.sh: change confusing directory name
15241 t1007-hash-object.sh: use quotes for the test description
15242 git-bisect: use dash-less form on git bisect log
15243 make remove-dashes: apply to scripts and programs as well, not just to builtins
15244 t6021: add a new test for git-merge-resolve
15245 Add a new test for git-merge-resolve
15246 Teach 'git merge' that some merge strategies no longer exist
15248 Nanako Shiraishi (7):
15249 environment.c: remove unused function
15250 config.c: make git_env_bool() static
15251 gitcli: Document meaning of --cached and --index
15252 cache-tree.c: make cache_tree_find() static
15253 builtin-describe.c: make a global variable "pattern" static
15254 parse-options.c: make check_typos() static
15257 Nguyễn Thái Ngọc Duy (1):
15258 Move all dashed-form commands to libexecdir
15260 Nicolas Pitre (11):
15261 call init_pack_revindex() lazily
15262 implement some resilience against pack corruptions
15263 test case for pack resilience against corruptions
15264 refactor pack structure allocation
15265 optimize verify-pack a bit
15266 move show_pack_info() where it belongs
15267 verify-pack: check packed object CRC when using index version 2
15268 verify-pack: test for detection of index v2 object CRC mismatch
15269 repack.usedeltabaseoffset config option now defaults to "true"
15270 pack.indexversion config option now defaults to 2
15271 restore legacy behavior for read_sha1_file()
15274 Documentation: remove {show,whatchanged}.difftree config options
15275 show_stats(): fix stats width calculation
15276 builtin-rerere: more carefully find conflict markers
15278 Patrick Higgins (1):
15279 Remove the use of '--' in merge program invocation
15282 t9600: allow testing with cvsps 2.2, including beta versions
15285 Add ANSI control code emulation for the Windows console
15288 Git.pm: Add remote_refs() git-ls-remote frontend
15289 Documentation/git-submodule.txt: Add Description section
15290 Documentation/RelNotes-1.6.0.txt: Expand on the incompatible packfiles
15291 Documentation/git-submodule.txt: Further clarify the description
15292 Documentation: How to ignore local changes in tracked files
15293 Documentation/git-merge.txt: Partial rewrite of How Merge Works
15295 Pierre Habouzit (13):
15296 parse-opt: have parse_options_{start,end}.
15297 parse-opt: Export a non NORETURN usage dumper.
15298 parse-opt: create parse_options_step.
15299 parse-opt: do not print errors on unknown options, return -2 intead.
15300 parse-opt: fake short strings for callers to believe in.
15301 parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
15302 revisions: split handle_revision_opt() from setup_revisions()
15303 git-blame: migrate to incremental parse-option [1/2]
15304 git-blame: migrate to incremental parse-option [2/2]
15305 parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
15306 git-blame: fix lapsus
15307 git-shortlog: migrate to parse-options partially.
15308 revisions: refactor handle_revision_opt into parse_revision_opt.
15311 builtin-fast-export: Add importing and exporting of revision marks
15313 Rafael Garcia-Suarez (1):
15314 gitweb: remove git_blame and rename git_blame2 to git_blame
15316 Ramsay Allan Jones (4):
15317 Fix some warnings (on cygwin) to allow -Werror
15318 t9113-*.sh: provide user feedback when test skipped
15319 t9100-git-svn-basic.sh: Fix determination of utf-8 locale
15320 git-request-pull: replace call to deprecated peek-remote
15323 Teach new attribute 'export-ignore' to git-archive
15324 archive: remove args member from struct archiver
15325 add context pointer to read_tree_recursive()
15326 archive: add baselen member to struct archiver_args
15327 archive: centralize archive entry writing
15328 archive: unify file attribute handling
15329 archive: remove extra arguments parsing code
15330 archive: make zip compression level independent from core git
15331 archive: remove unused headers
15334 git-gui: Fix accidental staged state toggle when clicking top pixel row
15336 Robert Shearman (1):
15337 git-send-email: Fix authenticating on some servers when using TLS.
15340 stash: introduce 'stash save --keep-index' option
15342 Shawn O. Pearce (2):
15343 Correct documentation for git-push --mirror
15344 bash completion: Remove dashed command completion support
15346 Soeren Finster (1):
15347 git-gui: Exit shortcut in MacOSX repaired
15349 Steffen Prohaska (5):
15350 Windows: Fix ntohl() related warnings about printf formatting
15351 compat/pread.c: Add a forward declaration to fix a warning
15352 Move code interpreting path relative to exec-dir to new function system_path()
15353 help.c: Add support for htmldir relative to git_exec_path()
15354 help (Windows): Display HTML in default browser using Windows' shell API
15356 Stephan Beyer (10):
15357 api-builtin.txt: update and fix typo
15358 t3404: stricter tests for git-rebase--interactive
15359 rerere: Separate libgit and builtin functions
15360 t/test-lib.sh: exit with small negagive int is ok with test_must_fail
15361 t/: Use "test_must_fail git" instead of "! git"
15362 Make usage strings dash-less
15363 git-am/git-mailsplit: correct synopsis for reading from stdin
15364 t3404: test two "preserve merges with -p" cases
15365 Make rebase--interactive use OPTIONS_SPEC
15366 Link git-shell only to a subset of libgit.a
15369 t/Makefile: use specified shell when running aggregation script
15371 Sverre Hvammen Johansen (1):
15372 reduce_heads(): thinkofix
15374 Sverre Rabbelier (2):
15375 Modify test-lib.sh to output stats to t/test-results/*
15376 Hook up the result aggregation in the test makefile.
15379 Don't use dash commands (git-foo) in tutorial-2
15382 bash: Add more option completions for 'git log'
15383 Add target "install-html" the the top level Makefile
15384 bash: Add long option completion for 'git send-email'
15387 git-send-email: add support for TLS via Net::SMTP::SSL
15388 git-send-email: prevent undefined variable warnings if no encryption is set
15389 git-add--interactive: replace hunk recounting with apply --recount
15390 git-add--interactive: remove hunk coalescing
15391 git-add--interactive: manual hunk editing mode
15392 git-send-email: Do not attempt to STARTTLS more than once
15393 Fix apply --recount handling of no-EOL line
15396 Version v1.5.6.6; changes since v1.5.6.5:
15397 -----------------------------------------
15399 Alexander Gavrilov (1):
15400 Fix quadratic performance in rewrite_one.
15403 t5304-prune: adjust file mtime based on system time rather than file mtime
15405 Francis Moreau (1):
15406 git-bisect: fix wrong usage of read(1)
15408 Ivan Stankovic (1):
15409 Documentation: fix invalid reference to 'mybranch' in user manual
15411 Junio C Hamano (8):
15412 Per-ref reflog expiry configuration
15413 Make default expiration period of reflog used for stash infinite
15414 asciidoc markup fixes
15415 Fix deleting reflog entries from HEAD reflog
15416 Re-fix rev-list-options documentation
15417 Do not talk about "diff" in rev-list documentation.
15418 gitweb: do not run "git diff" that is Porcelain
15422 Fix escaping of glob special characters in pathspecs
15424 Linus Torvalds (4):
15425 Split up default "core" config parsing into helper routine
15426 Split up default "user" config parsing into helper routine
15427 Split up default "i18n" and "branch" config parsing into helper routines
15428 Add config option to enable 'fsync()' of object files
15431 Fail properly when cloning from invalid HTTP URL
15434 reflog test: add more tests for 'reflog delete'
15437 Documentation: rev-list-options: Fix -g paragraph formatting
15440 Version v1.5.6.5; changes since v1.5.6.4:
15441 -----------------------------------------
15443 Anders Melchiorsen (1):
15444 Documentation: fix diff.external example
15446 Björn Steinbrink (1):
15447 index-pack.c: correctly initialize appended objects
15450 t/t4202-log.sh: add newline at end of file
15452 Ciaran McCreesh (1):
15453 Make git-add -i accept ranges like 7-
15456 init: handle empty "template" parameter
15459 git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout.
15461 Johannes Schindelin (1):
15462 sort_in_topological_order(): avoid setting a commit flag
15464 Jonathan Nieder (2):
15465 fix usage string for git grep
15466 git-diff(1): "--c" -> "--cc" typo fix
15468 Junio C Hamano (12):
15469 refresh-index: fix bitmask assignment
15470 tests: propagate $(TAR) down from the toplevel Makefile
15471 Makefile: fix shell quoting
15472 make sure parsed wildcard refspec ends with slash
15473 Documentation: clarify diff --cc
15474 Update my e-mail address
15475 Start 1.5.6.5 RelNotes to describe accumulated fixes
15476 builtin-name-rev.c: split deeply nested part from the main function
15477 RelNotes 1.5.6.5 updates
15478 fix diff-tree --stdin documentation
15479 Files given on the command line are relative to $cwd
15482 Linus Torvalds (1):
15483 diff.renamelimit is a basic diff configuration
15486 Documentation: typos / spelling fixes in older RelNotes
15488 Peter Valdemar Mørch (1):
15489 send-email: find body-encoding correctly
15491 Pierre Habouzit (2):
15492 git-checkout: fix command line parsing.
15493 git-submodule: move ill placed shift.
15496 git-name-rev: allow --name-only in combination with --stdin
15499 git-name-rev: don't use printf without format
15502 builtin-revert.c: typofix
15505 Propagate -u/--upload-pack option of "git clone" to transport.
15508 Version v1.5.6.4; changes since v1.5.6.3:
15509 -----------------------------------------
15511 Dmitry Potapov (3):
15512 Fix buffer overflow in git-grep
15513 Fix buffer overflow in git diff
15514 Fix buffer overflow in prepare_attr_stack
15516 Johannes Schindelin (3):
15517 git daemon: avoid calling syslog() from a signal handler
15518 Add pretty format %aN which gives the author name, respecting .mailmap
15519 git fetch-pack: do not complain about "no common commits" in an empty repo
15522 t7600-merge: Use test_expect_failure to test option parsing
15524 Junio C Hamano (4):
15525 Start preparing 1.5.6.4 release notes
15526 rev-list: honor --quiet option
15527 http-fetch: do not SEGV after fetching a bad pack idx file
15530 Lars Noschinski (1):
15531 git-cvsserver: fix call to nonexistant cleanupWorkDir()
15533 Lukas Sandström (1):
15534 git-mailinfo: Fix getting the subject from the in-body [PATCH] line
15537 builtin-rm: fix index lock file path
15540 Documentation/git-cherry-pick.txt et al.: Fix misleading -n description
15542 Shawn O. Pearce (9):
15543 Correct pack memory leak causing git gc to try to exceed ulimit
15544 bash completion: Improve responsiveness of git-log completion
15545 bash completion: Don't offer "a.." as a completion for "a."
15546 bash completion: Append space after file names have been completed
15547 bash completion: Resolve git show ref:path<tab> losing ref: portion
15548 index-pack: Refactor base arguments of resolve_delta into a struct
15549 index-pack: Chain the struct base_data on the stack for traversal
15550 index-pack: Track the object_entry that creates each base_data
15551 index-pack: Honor core.deltaBaseCacheLimit when resolving deltas
15554 rebase-i: keep old parents when preserving merges
15555 api-run-command.txt: typofix
15558 Version v1.5.6.3; changes since v1.5.6.2:
15559 -----------------------------------------
15562 git-clone: remove leftover debugging fprintf().
15565 builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and 'format.suffix'
15566 convert.c: Use 'git_config_string' to get 'smudge' and 'clean'
15567 diff.c: Use 'git_config_string' to get 'diff.external'
15568 http.c: Use 'git_config_string' to clean up SSL config.
15569 builtin-commit.c: Use 'git_config_string' to get 'commit.template'
15571 Christian Couder (1):
15572 Fix "config_error_nonbool" used with value instead of key
15575 git-svn.perl: workaround assertions in svn library 1.5.0
15578 make deleting a missing ref more quiet
15580 Johannes Schindelin (1):
15581 run_command(): respect GIT_TRACE
15583 Junio C Hamano (6):
15584 attribute documentation: keep EXAMPLE at end
15585 clone -q: honor "quiet" option over native transports.
15586 mailinfo: feed the correct line length to decode_transfer_encoding()
15587 Start preparing release notes for 1.5.6.3
15588 t0004: fix timing bug
15591 Linus Torvalds (1):
15592 racy-git: an empty blob has a fixed object name
15594 Lukas Sandström (1):
15595 git-mailinfo: document the -n option
15598 git-submodule - Fix bugs in adding an existing repo as a module
15600 Matthew Ogilvie (1):
15601 Documentation cvs: Clarify when a bare repository is needed
15603 Mikael Magnusson (1):
15604 Fix grammar in git-rev-parse(1).
15606 Nikolaus Schulz (1):
15607 Documentation: be precise about which date --pretty uses
15610 Fix backwards-incompatible handling of core.sharedRepository
15613 bash: offer only paths after '--'
15615 Shawn O. Pearce (1):
15616 Remove unnecessary pack-*.keep file after successful git-clone
15619 git-am: Do not exit silently if committer is unset
15622 Version v1.5.6.2; changes since v1.5.6.1:
15623 -----------------------------------------
15625 Avery Pennarun (1):
15626 git-svn: avoid filling up the disk with temp files.
15628 Björn Steinbrink (1):
15629 git cat-file: Fix memory leak in batch mode
15632 git-svn: don't sanitize remote names in config
15635 fetch: report local storage errors in status table
15636 doc/rev-parse: clarify reflog vs --until for specifying revisions
15637 fetch: give a hint to the user when local refs fail to update
15640 avoid off-by-one error in run_upload_archive
15643 fix git config example syntax
15645 Johannes Schindelin (2):
15646 clone: respect url.insteadOf setting in global configs
15647 clone: respect the settings in $HOME/.gitconfig and /etc/gitconfig
15649 Junio C Hamano (9):
15650 Allow "git-reset path" when unambiguous
15651 diff --check: do not discard error status upon seeing a good line
15652 git-shell: accept "git foo" form
15655 Start draft release notes for 1.5.6.2
15656 Work around gcc warnings from curl headers
15657 Fix executable bits in t/ scripts
15660 Shawn O. Pearce (1):
15661 Fix describe --tags --long so it does not segfault
15664 Fix 'git show' on signed tag of signed tag of commit
15667 Version v1.5.6.1; changes since v1.5.6:
15668 ---------------------------------------
15671 git-merge.sh: fix typo in usage message: sucesses --> succeeds
15672 t7502-commit.sh: test_must_fail doesn't work with inline environment variables
15675 completion: add --graph to log command completion
15677 Dmitry Potapov (1):
15678 fix update-hook-example to work with packed tag references
15681 Documentation: fix formatting in git-svn
15682 git-svn: make rebuild respect rewriteRoot option
15685 for-each-ref: implement missing tag values
15686 clone: create intermediate directories of destination repo
15688 Junio C Hamano (2):
15689 diff -c/--cc: do not include uninteresting deletion before leading context
15692 Linus Torvalds (1):
15693 Make git_dir a path relative to work_tree in setup_work_tree()
15695 Michele Ballabio (1):
15696 parse-options.c: fix documentation syntax of optional arguments
15698 Patrick Higgins (1):
15699 Workaround for AIX mkstemp()
15702 git-rebase.sh: Add check if rebase is in progress
15703 api-builtin.txt: update and fix typo
15704 api-parse-options.txt: Introduce documentation for parse options API
15705 Extend parse-options test suite
15708 Version v1.5.6; changes since v1.5.6-rc3:
15709 -----------------------------------------
15711 Alejandro Mery (1):
15712 git-am: head -1 is obsolete and doesn't work on some new systems
15714 Christian Couder (1):
15715 Documentation: RelNotes-1.5.6: talk about renamed HTML files
15718 clean up error conventions of remote.c:match_explicit
15721 cpio is no longer used by git-clone
15722 Consistency: Use "libcurl" instead of "cURL library" and "curl"
15723 The "curl" executable is no longer required
15725 Junio C Hamano (7):
15726 Makefile: update check-docs target
15727 Update RPM spec to drop curl executable requirement
15728 diff.c: fix emit_line() again not to add extra line
15729 create_tempfile: make sure that leading directories can be accessible by peers
15730 sha1_file.c: simplify parse_pack_index()
15731 builtin-rerere: fix a small leak
15735 gitweb: quote commands properly when calling the shell
15736 gitweb: remove unused parse_ref method
15738 Linus Torvalds (1):
15739 write_loose_object: don't bother trying to read an old object
15742 run-command documentation: fix "memset()" parameter
15743 path-list documentation: document all functions and data structures
15746 Fix approxidate("never") to always return 0
15748 Pierre Habouzit (1):
15749 Make git reflog expire honour core.sharedRepository.
15752 diff: reset color before printing newline
15755 Version v1.5.6-rc3; changes since v1.5.6-rc2:
15756 ---------------------------------------------
15758 Ask Bjørn Hansen (2):
15759 gitweb setup instruction: rewrite HEAD and root as well
15760 send-email: Allow the envelope sender to be set via configuration
15762 Avery Pennarun (2):
15763 git-svn: don't append extra newlines at the end of commit messages.
15764 git-svn: test that extra blank lines aren't inserted in commit messages.
15766 Boyd Lynn Gerber (2):
15767 progress.c: avoid use of dynamic-sized array
15768 Port to 12 other Platforms.
15771 Improve sed portability
15773 Christian Couder (1):
15774 documentation: bisect: remove bits talking about a bisection branch
15776 Flavio Poletti (1):
15777 git-instaweb: improve auto-discovery of httpd and call conventions.
15780 fix typo in tutorial
15782 Geoffrey Irving (1):
15783 doc: adding gitman.info and *.texi to .gitignore
15785 Jakub Narebski (2):
15786 gitweb: Make it work with $GIT containing spaces
15787 Use 'trash directory' thoroughly in t/test-lib.sh
15790 document --pretty=tformat: option
15792 Johannes Schindelin (1):
15793 merge-recursive: respect core.autocrlf when writing out the result
15796 make_nonrelative_path: Use is_absolute_path()
15797 Remove exec bit from builtin-fast-export.c
15799 Junio C Hamano (8):
15800 http-push.c: remove duplicated code
15801 "remote prune": be quiet when there is nothing to prune
15802 Documentation/git-pull.txt: Use more standard [NOTE] markup
15803 Documentation: exclude @pxref{[REMOTES]} from texinfo intermediate output
15804 user-manual: describe how higher stages are set during a merge
15805 t4126: fix test that happened to work due to timing
15806 sha1_file.c: dead code removal
15810 t1006-cat-file.sh: typo
15811 cat-file --batch / --batch-check: do not exit if hashes are missing
15812 Documentation/git-cat-file.txt: add missing line break
15813 t/.gitattributes: only ignore whitespace errors in test files
15815 Linus Torvalds (4):
15816 Consolidate SHA1 object file close
15817 Avoid cross-directory renames and linking on object creation
15818 Make loose object file reading more careful
15819 Simplify and rename find_sha1_file()
15821 Marius Storm-Olsen (1):
15822 Add testcase for merging in a CRLF repo
15825 git-submodule - Fix errors regarding resolve_relative_url
15827 Mikael Magnusson (1):
15831 Don't allocate too much memory in quote_ref_url
15834 Remove unused code in parse_commit_buffer()
15835 git-rebase -i: mention the short command aliases in the todo list
15836 git-read-tree: document -v option.
15839 remote show: fix the -n option
15840 builtin-remote: split show_or_prune() in two separate functions
15841 remote prune: print the list of pruned branches
15842 remote show: list tracked remote branches with -n
15844 Paul Mackerras (1):
15845 gitk: Handle detached heads better
15847 Philippe Bruhat (1):
15848 git-cvsimport: do not fail when CVSROOT is /
15851 git-send-email: allow whitespace in addressee list
15854 Ignore .gitattributes in bare repositories
15857 git add: add long equivalents of '-u' and '-f' options
15858 completion: add more 'git add' options
15860 Shawn O. Pearce (1):
15861 fast-export: Correctly generate initial commits with no parents
15864 git-commit.txt: Correct option alternatives
15865 git-commit.txt: Add missing long/short options
15866 Docs: Use "-l::\n--long\n" format in OPTIONS sections
15867 Docs: add some long/short options
15868 git-describe.txt: document --always
15869 git-name-rev.txt: document --no-undefined and --always
15872 Version v1.5.6-rc2; changes since v1.5.6-rc1:
15873 ---------------------------------------------
15876 graph API: fix "git log --graph --first-parent"
15877 git log --graph: print '*' for all commits, including merges
15880 Fix t5516 on cygwin: it does not like double slashes at the beginning of a path
15882 Björn Steinbrink (1):
15883 name-rev: Fix segmentation fault when using --all
15885 Christian Couder (2):
15886 documentation: convert "diffcore" and "repository-layout" to man pages
15887 documentation: move git(7) to git(1)
15889 Daniel Barkalow (1):
15890 Use nonrelative paths instead of absolute paths for cloned repositories
15892 Dirk Süsserott (1):
15893 Documentation/git-mailsplit: Enhanced description of -o option
15895 Jakub Narebski (1):
15896 gitweb: Add charset info to "raw" output of 'text/plain' blobs
15899 Fix "git clone http://$URL" to check out the worktree when asked
15901 Junio C Hamano (6):
15902 t7502: do not globally unset GIT_COMMITTER_* environment variables
15903 t7502: tighten loosely written test sequence
15904 Documentation: git-log cannot use rev-list specific options
15905 t7502: honor SHELL_PATH
15910 cat-file --batch: flush stdout also when objects are missing
15911 git-for-each-ref.txt: minor improvements
15913 Michael Dressel (1):
15914 describe: match pattern for lightweight tags too
15917 Strbuf documentation: document most functions
15920 Print info about "git help COMMAND" on git's main usage pages
15923 Version v1.5.6-rc1; changes since v1.5.6-rc0:
15924 ---------------------------------------------
15927 graph API: improve display of merge commits
15928 graph API: avoid printing unnecessary padding before some octopus merges
15930 Christian Couder (2):
15931 bisect: use "$GIT_DIR/BISECT_START" to check if we are bisecting
15932 Documentation: convert "glossary" and "core-tutorial" to man pages
15934 Christian Engwer (1):
15935 git-svn fails in prop_walk if $self->{path} is not empty
15937 Dmitry V. Levin (1):
15938 builtin-fetch.c (store_updated_refs): Honor update_local_ref() return value
15941 Documentation/git-bundle.txt: fix synopsis
15942 commit --interactive: properly update the index before commiting
15944 Jakub Narebski (2):
15945 gitweb: Remove gitweb/test/ directory
15946 gitweb: Fix "next" link on bottom of page
15949 git-reset: honor -q and do not show progress message
15952 clone: make sure we support the transport type
15954 Johannes Schindelin (1):
15955 hg-to-git: add --verbose option
15958 t5700-clone-reference: Quote $U
15959 Revert "filter-branch: subdirectory filter needs --full-history"
15960 rebase --interactive: Compute upstream SHA1 before switching branches
15962 John J. Franey (1):
15963 Clarify description of <repository> argument to pull/fetch for naming remotes.
15965 Junio C Hamano (25):
15966 tests: do not use implicit "git diff --no-index"
15967 diff-files: do not play --no-index games
15968 "git diff": do not ignore index without --no-index
15969 Update draft release notes for 1.5.6
15970 log --graph: do not accept log --graphbogus
15971 log --pretty: do not accept bogus "--prettyshort"
15972 Release Notes for 1.5.5.2
15973 Documentation/git.txt: link to 1.5.5.2 documentation.
15974 Makefile: fix dependency on wt-status.h
15975 show-branch --current: do not barf on detached HEAD
15976 git-diff: allow --no-index semantics a bit more
15977 git diff --no-index: default to page like other diff frontends
15979 t5100: Avoid filename "nul"
15980 Git::cat_blob: allow using an empty blob to fix git-svn breakage
15981 fix sha1_pack_index_name()
15982 Manual subsection to refer to other pages is SEE ALSO
15983 Documentation: git-cherry uses git-patch-id
15984 "git checkout -- paths..." should error out when paths cannot be written
15985 checkout: make reset_clean_to_new() not die by itself
15986 checkout: consolidate reset_{to_new,clean_to_new}()
15987 unpack_trees(): allow callers to differentiate worktree errors from merge errors
15988 checkout: "best effort" checkout
15989 commit: drop duplicated parents
15992 Karl Hasselström (3):
15993 Add some tests for git update-ref -d
15994 Fix path duplication in git svn commit-diff
15995 Revert "git.el: Set process-environment instead of invoking env"
15998 Documentation/git-filter-branch.txt: Fix description of --commit-filter
16001 gitweb: only display "next" links in logs if there is a next page
16002 t/test-lib.sh: resolve symlinks in working directory, for pathname comparisons
16003 Git.pm: fix documentation of hash_object
16004 glossary: improve a few links
16005 Git.pm: fix return value of config method
16007 Linus Torvalds (2):
16008 Make pack creation always fsync() the result
16009 Remove now unnecessary 'sync()' calls
16012 git-init: accept --bare option
16014 Marius Storm-Olsen (2):
16015 Clearify the documentation for core.ignoreStat
16016 Add shortcut in refresh_cache_ent() for marked entries.
16018 Michele Ballabio (1):
16019 Documentation: fix graph in git-rev-parse.txt
16022 Revision walking documentation: document most important functions
16025 make verify-pack a bit more useful with bad packs
16028 rollback lock files on more signals than just SIGINT
16031 builtin-fast-export: Only output a single parent per line
16034 Add a --dry-run option to git-svn rebase
16036 Shawn O. Pearce (8):
16037 git-gui: Add a --trace command line option
16038 git-gui: Handle workdir detection when CYGWIN=nowinsymlinks
16039 Don't diff empty tree on branch creation in paranoid update hook
16040 Don't load missing ACL files in paranoid update hook
16041 Ignore no-op changes in paranoid update hook
16042 Remove unused remote_prefix member in builtin-remote
16043 Make "git-remote prune" delete refs according to fetch specs
16044 Make "git-remote rm" delete refs acccording to fetch specs
16047 Add test cases for git-am
16048 Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh
16051 git-gui: Vertically align textboxes with labels
16054 Version v1.5.6-rc0; changes since v1.5.5.6:
16055 -------------------------------------------
16058 Add tests for git cat-file
16059 git-cat-file: Small refactor of cmd_cat_file
16060 git-cat-file: Make option parsing a little more flexible
16061 git-cat-file: Add --batch-check option
16062 git-cat-file: Add --batch option
16063 Move git-hash-object tests from t5303 to t1007
16064 Add more tests for git hash-object
16065 git-hash-object: Add --stdin-paths option
16066 Git.pm: Add command_bidi_pipe and command_close_bidi_pipe
16067 Git.pm: Add hash_and_insert_object and cat_blob
16068 git-svn: Speed up fetch
16070 Adam Simpkins (11):
16071 Remove dead code: show_log() sep argument and diff_options.msg_sep
16072 log: print log entry terminator even if the message is empty
16073 revision API: split parent rewriting and parent printing options
16074 Add history graph API
16075 log and rev-list: add --graph option
16076 graph API: eliminate unnecessary indentation
16077 graph API: fix graph mis-alignment after uninteresting commits
16078 graph API: don't print branch lines for uninteresting merge parents
16079 log --graph --left-right: show left/right information in place of '*'
16080 Fix output of "git log --graph --boundary"
16081 get_revision(): honor the topo_order flag for boundary commits
16084 Use the modern syntax of git-diff-files in t2002-checkout-cache-u.sh
16085 Improve reporting of errors in config file routines
16086 Make the exit code of add_file_to_index actually useful
16087 Extend interface of add_files_to_cache to allow ignore indexing errors
16088 Add --ignore-errors to git-add to allow it to skip files with read errors
16089 Add a test for git-add --ignore-errors
16090 Add a config option to ignore errors for git-add
16091 Ensure that a test is run in the trash directory
16092 Fix t6031 on filesystems without working exec bit
16093 Fix t3701 if core.filemode disabled
16095 Anders Waldenborg (1):
16096 gitweb: Convert string to internal form before chopping in chop_str
16098 Avery Pennarun (3):
16099 git-svn: add documentation for --use-log-author option.
16100 git-svn: Add --add-author-from option.
16101 git-svn: add documentation for --add-author-from option.
16103 Bart Trojanowski (1):
16104 make git-status use a pager
16107 filter-branch.sh: support nearly proper tag name filtering
16108 compat/fopen.c: avoid clobbering the system defined fopen macro
16109 repack: modify behavior of -A option to leave unreferenced objects unpacked
16110 git-gc: always use -A when manually repacking
16111 builtin-gc.c: deprecate --prune, it now really has no effect
16112 builtin-clone.c: Need to closedir() in copy_or_link_directory()
16113 t/Makefile: "trash" directory was renamed recently
16116 git-rebase.sh: Fix --merge --abort failures when path contains whitespace
16117 config.c: Escape backslashes in section names properly
16118 git-send-email.perl: Handle shell metacharacters in $EDITOR properly
16119 test-lib.sh: Add a test_set_editor function to safely set $VISUAL
16120 Use test_set_editor in t9001-send-email.sh
16121 test-lib.sh: Fix some missing path quoting
16122 lib-git-svn.sh: Fix quoting issues with paths containing shell metacharacters
16123 Don't use the 'export NAME=value' in the test scripts.
16124 Fix tests breaking when checkout path contains shell metacharacters
16125 Rename the test trash directory to contain spaces.
16127 Caio Marcelo de Oliveira Filho (1):
16128 git-format-patch: add --no-binary to omit binary changes in the patch.
16131 Documentation/git-prune.txt: document unpacked logic
16132 Documentation/git-repack.txt: document new -A behaviour
16135 Updated status to show 'Not currently on any branch' in red
16137 Christian Couder (21):
16138 bisect: add "git bisect help" subcommand to get a long usage string
16139 help: use man viewer path from "man.<tool>.path" config var
16140 documentation: help: add "man.<tool>.path" config variable
16141 help: use "man.<tool>.cmd" as custom man viewer command
16142 documentation: help: add info about "man.<tool>.cmd" config var
16143 documentation: web--browse: add a note about konqueror
16144 rev-parse: teach "--verify" to be quiet when using "-q" or "--quiet"
16145 rev-parse: fix --verify to error out when passed junk after a good rev
16146 Documentation: hooks: fix missing verb in pre-applypatch description
16147 Documentation: rename "hooks.txt" to "githooks.txt" and make it a man page
16148 Documentation: improve "add", "pull" and "format-patch" examples
16149 Documentation: bisect: add a few "git bisect run" examples
16150 rev-parse: add test script for "--verify"
16151 rev-parse: fix using "--default" with "--verify"
16152 rev-parse --verify: do not output anything on error
16153 Documentation: rev-parse: add a few "--verify" and "--default" examples
16154 bisect: add test cases to check that "git bisect start" is atomic
16155 bisect: fix left over "BISECT_START" file when starting with junk rev
16156 bisect: trap critical errors in "bisect_start"
16157 bisect: use a detached HEAD to bisect
16158 Documentation: convert tutorials to man pages
16160 Christian Stimming (3):
16161 git-gui: Update German translation
16162 gitk: Update German translation
16163 gitk: German translation again updated
16165 Clemens Buchacher (2):
16166 Reset the signal being handled
16167 http-push: remove remote locks on exit signals
16169 Clifford Caoile (1):
16170 git.el: Set process-environment instead of invoking env
16173 completion: allow 'git remote' subcommand completion
16174 completion: remove use of dashed git commands
16175 Allow cherry-pick (and revert) to add signoff line
16177 Daniel Barkalow (12):
16178 Make walker.fetch_ref() take a struct ref.
16179 Make ls-remote http://... list HEAD, like for git://...
16180 Mark the list of refs to fetch as const
16181 Add a lockfile function to append to a file
16182 Add a library function to add an alternate to the alternates file
16183 Have a constant extern refspec for "--tags"
16184 Allow for having for_each_ref() list extra refs
16185 Add a function to set a non-default work tree
16186 Provide API access to init_db()
16188 clone: fall back to copying if hardlinking fails
16189 Test that --reference actually suppresses fetching referenced objects
16191 Dmitry Potapov (1):
16192 git-init: autodetect core.ignorecase
16194 Dustin Sallings (2):
16195 Allow tracking branches to set up rebase by default.
16196 Allow tracking branches to set up rebase by default.
16199 git-svn: fix cloning of HTTP URLs with '+' in their path
16201 Frank Lichtenheld (4):
16202 var: Don't require to be in a git repository.
16203 Git.pm: Don't require a repository instance for config
16204 Git.pm: Don't require repository instance for ident
16205 send-email: Don't require to be called in a repository
16208 gitweb: fallback to system-wide config file if default config does not exist
16209 gitweb: fallback to system-wide config file (fixup)
16210 gitk: Makefile/install: force permissions when installing files and dirs
16212 Govind Salinas (1):
16213 pretty.c: add %x00 format specifier.
16215 Gustaf Hendeby (6):
16216 git-svn: Make create-ignore use git add -f
16217 Documentation: Add create-ignore to git svn manual
16218 Documentation/config.txt: Add git-gui options
16219 Documentation: Add missing git svn commands
16220 Documentation: Fix skipped section level
16221 Make git add -n and git -u -n output consistent
16224 Make core.sharedRepository more generic
16225 Document functions xmemdupz(), xread() and xwrite()
16226 Die for an early EOF in a file reading loop
16227 Make read_in_full() and write_in_full() consistent with xread() and xwrite()
16228 Cleanup xread() loops to use read_in_full()
16229 Add log.date config variable
16230 Remove redundant code, eliminate one static variable
16232 Imran M Yousuf (1):
16233 Use '-f' option to point to the .gitmodules file
16235 Jakub Narebski (1):
16236 gitweb: Use feed link according to current view
16239 add--interactive: ignore mode change in 'p'atch command
16240 add--interactive: allow user to choose mode update
16241 git-fetch: always show status of non-tracking-ref fetches
16242 git-remote: show all remotes with "git remote show"
16243 Documentation: point git-prune users to git-gc
16244 add merge.renamelimit config option
16245 bump rename limit defaults
16246 diff: make "too many files" rename warning optional
16247 fix bsd shell negation
16248 t5000: tar portability fix
16249 clone: bsd shell portability fix
16250 filter-branch: fix variable export logic
16253 Add a test for another combination of --reference
16254 Add test for cloning with "--reference" repo being a subset of source repo
16256 Johannes Schindelin (10):
16257 Provide git_config with a callback-data parameter
16258 builtin-clone: fix initial checkout
16259 cvsexportcommit: chomp only removes trailing whitespace
16260 diff options: Introduce --ignore-submodules
16261 Teach update-index about --ignore-submodules
16262 Ignore dirty submodule states during rebase and stash
16263 cvsexportcommit: introduce -W for shared working trees (between Git and CVS)
16264 submodule update: add convenience option --init
16265 pull --rebase: exit early when the working directory is dirty
16266 mailsplit and mailinfo: gracefully handle NUL characters
16269 builtin-commit.c: Remove a redundant assignment.
16270 git-gui: Report less precise object estimates for database compression
16271 compat-util: avoid macro redefinition warning
16274 Add otherwise missing --strict option to unpack-objects summary.
16276 Junio C Hamano (24):
16277 Optimize rename detection for a huge diff
16278 t5300: add test for "unpack-objects --strict"
16279 unpack-objects: fix --strict handling
16280 rebase [--onto O] A B: omit needless checkout
16281 sha1-lookup: more memory efficient search in sorted list of SHA-1
16282 diff: make --dirstat binary-file safe
16283 sha1-lookup: make selection of 'middle' less aggressive
16284 log: teach "terminator" vs "separator" mode to "--pretty=format"
16285 git_config_bool_or_int()
16286 write_index(): optimize ce_smudge_racily_clean_entry() calls with CE_UPTODATE
16287 diff-files: mark an index entry we know is up-to-date as such
16288 Fix git_config_bool_or_int
16289 First batch of post 1.5.5 updates
16290 diff: a submodule not checked out is not modified
16291 diff-lib.c: rename check_work_tree_entity()
16292 is_racy_timestamp(): do not check timestamp for gitlinks
16293 git-svn: add test for --add-author-from and --use-log-author
16294 builtin-apply: typofix
16295 builtin-apply: accept patch to an empty file
16296 builtin-apply: do not declare patch is creation when we do not know it
16297 unpack-trees: allow Porcelain to give different error messages
16298 "git-add -n -u" should not add but just report
16299 mailinfo: apply the same fix not to lose NULs in BASE64 and QP codepaths
16300 mailsplit: minor clean-up in read_line_with_nul()
16303 post-merge: Add it's not executed if merge failed.
16305 Krzysztof Kowalczyk (1):
16306 alloc_ref_from_str(): factor out a common pattern of alloc_ref from string
16309 Add platform-independent .git "symlink"
16310 Teach resolve_gitlink_ref() about the .git file
16311 Teach git-submodule.sh about the .git file
16312 Teach GIT-VERSION-GEN about the .git file
16313 git-branch: add support for --merged and --no-merged
16314 git-branch.txt: compare --contains, --merged and --no-merged
16315 Add tests for `branch --[no-]merged`
16316 revision.c: really honor --first-parent
16318 Linus Torvalds (12):
16319 Make unpack_trees_options bit flags actual bitfields
16320 Move name hashing functions into a file of its own
16321 Make "index_name_exists()" return the cache_entry it found
16322 Make hash_name_lookup able to do case-independent lookups
16323 Add 'core.ignorecase' option
16324 Make branch merging aware of underlying case-insensitive filsystems
16325 Make unpack-tree update removed files before any updated files
16326 When adding files to the index, add support for case-independent matches
16327 Make git-add behave more sensibly in a case-insensitive environment
16328 Optimize match_pathspec() to avoid fnmatch()
16329 Avoid some unnecessary lstat() calls
16330 Optimize symlink/directory detection
16333 Documentation on --git-dir and --work-tree
16335 Marcel Koeppen (2):
16336 Replace in-place sed in t7502-commit
16337 Fix prepare-commit-msg hook and replace in-place sed
16340 Be more careful with objects directory permissions on clone
16342 Martin Koegler (3):
16343 unpack-objects: prevent writing of inconsistent objects
16344 receive-pack: allow using --strict mode for unpacking objects
16345 t5300: add test for "index-pack --strict"
16347 Matthew Ogilvie (3):
16348 git-cvsserver: add mechanism for managing working tree and current directory
16349 implement gitcvs.usecrlfattr
16350 git-cvsserver: add ability to guess -kb from contents
16352 Matthias Kestenholz (1):
16353 Use color.ui variable in scripts too
16356 git-svn: detect and fail gracefully when dcommitting to a void
16358 Michele Ballabio (4):
16359 gitk: Disable "Reset %s branch to here" when on a detached head
16360 gitk: Move es.po where it belongs
16361 builtin-cat-file.c: use parse_options()
16362 change quoting in test t1006-cat-file.sh
16365 Makefile: update the default build options for AIX
16368 git-gc --auto: add pre-auto-gc hook
16369 Documentation/hooks: add pre-auto-gc hook
16370 contrib/hooks: add an example pre-auto-gc hook
16371 git checkout: add -t alias for --track
16372 git-format-patch: add a new format.cc configuration variable
16373 git-send-email: add a new sendemail.cc configuration variable
16374 Add tests for sendemail.cc configuration variable
16375 INSTALL: add a note about GNU interactive tools has been renamed
16376 git-fast-import: rename cmd_*() functions to parse_*()
16377 git-merge: exclude unnecessary options from OPTIONS_SPEC
16378 CodingGuidelines: Add a note to avoid assignments inside if()
16381 pack-objects: small cleanup
16382 pack-objects: remove some double negative logic
16383 pack-objects: simplify the condition associated with --all-progress
16384 pack-objects: clean up write_object() a bit
16385 pack-objects: move compression code in a separate function
16386 pack-objects: allow for early delta deflating
16387 pack-objects: fix early eviction for max depth delta objects
16388 add a force_object_loose() function
16389 let pack-objects do the writing of unreachable objects as loose objects
16392 Add a remote.*.mirror configuration option
16393 add special "matching refs" refspec
16395 Paul Mackerras (40):
16396 gitk: Use git log without --topo-order and reorganize the commits ourselves
16397 gitk: Fix bug in assigning row numbers to arcs
16398 gitk: Fix bug in parsing multiple revision arguments
16399 gitk: Compute row numbers and order tokens lazily
16400 gitk: Fix a couple of bugs
16401 gitk: Fix more bugs resulting in Tcl "no such element in array" errors
16402 gitk: More bug fixes and cleanups
16403 gitk: Implement date mode in the new framework
16404 gitk: Fix another collection of bugs
16405 gitk: Don't try to show local changes from a head that isn't shown
16406 gitk: Keep the same commits visible as other commits come in
16407 gitk: Fix some corner cases in the targetid/targetrow stuff
16408 gitk: Fix a couple of bugs in the find function
16409 gitk: Fix potential bug with fake commit IDs in renumbervarc
16410 gitk: Index [fnvr]highlights by id rather than row
16411 gitk: Fix handling of flag arguments
16412 gitk: Fix a bug in make_disporder
16413 gitk: Select head of current branch by default
16414 gitk: Select something appropriate on cherry-pick, branch reset and checkout
16415 gitk: Fix bug where editing an existing view would cause an infinite loop
16416 gitk: Fix bug causing Tcl error when no commits are selected
16417 gitk: Fix cherry-picking to insert a real row not a fake row
16418 gitk: Cope better with getting commits that we have already seen
16419 gitk: Fix bug where arcs could get lost
16420 gitk: Handle updating with path limiting better
16421 gitk: Fix problems with target row stuff
16422 gitk: Don't filter view arguments through git rev-parse
16423 gitk: Correct a few strings and comments to say "git log"
16424 gitk: Fix some corner cases in computing vrowmod and displayorder
16425 gitk: Avoid a crash in selectline if commitinfo($id) isn't set
16426 gitk: Fix problem with target row not being in scroll region
16427 gitk: Reorganize processing of arguments for git log
16428 gitk: Fix handling of tree file list with special chars in names
16429 gitk: Make updates go faster
16430 gitk: Synchronize highlighting in file view for 'f' and 'b' commands
16431 gitk: Show current row number and total number of rows
16432 gitk: Add a progress bar for checking out a head
16433 gitk: Fix "wrong # coordinates" error on reload
16434 gitk: Fix bug where current row number display stops working
16435 gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload"
16438 Make git-cvsimport remove ['s from tags, as bad_ref_char doesn't allow them.
16440 Peter Karlsson (1):
16441 gitk: Initial Swedish translation.
16444 git-submodule summary: --for-status option
16445 builtin-status: submodule summary support
16446 builtin-status: Add tests for submodule summary
16447 t4027: test diff for submodule with empty directory
16448 Add t7506 to test submodule related functions for git-status
16450 Rafael Garcia-Suarez (1):
16451 Spelling fixes in the gitweb documentation
16454 bash: Add completion for gitk --merge
16455 Documentation gitk: Describe what --merge does
16458 doc: moved merge.* config variables into separate merge-config.txt
16459 merge, pull: introduce '--(no-)stat' option
16460 add 'merge.stat' config variable
16461 fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
16462 merge, pull: add '--(no-)log' command line option
16465 Preparation to call determine_author_info from prepare_to_commit
16466 commit: Show author if different from committer
16467 commit: Show committer if automatic
16470 gitk: Spanish translation of gitk
16472 Sebastian Schuberth (1):
16473 mergetool: Make ECMerge use the settings as specified by the user in the GUI
16475 Shawn O. Pearce (3):
16476 git-gui: Don't use '$$cr master' with aspell earlier than 0.60
16477 git-gui: Setup branch.remote,merge for shorthand git-pull
16478 git-gui: Delete branches with 'git branch -D' to clear config
16480 Steffen Prohaska (4):
16481 t0050: Test autodetect core.ignorecase
16482 t0050: Set core.ignorecase case to activate case insensitivity
16483 t0050: Add test for case insensitive add
16484 t0050: Fix merge test on case sensitive file systems
16487 builtin-apply.c: use git_config_string() to get apply_default_whitespace
16489 Stephen R. van den Berg (2):
16490 Simplify and fix --first-parent implementation
16491 git-svn: Same default as cvsimport when using --use-log-author
16494 Add svn-compatible "blame" output format to git-svn
16497 Documentation/git-web--browse.txt: fix small typo
16500 gitk: Allow users to view diffs in external diff viewer
16503 cvsexportcommit: Create config option for CVS dir
16506 Version v1.5.5.6; changes since v1.5.5.5:
16507 -----------------------------------------
16509 Junio C Hamano (2):
16510 gitweb: do not run "git diff" that is Porcelain
16514 Version v1.5.5.5; changes since v1.5.5.4:
16515 -----------------------------------------
16518 fix typo in tutorial
16521 Remove exec bit from builtin-fast-export.c
16523 Junio C Hamano (4):
16524 diff.c: fix emit_line() again not to add extra line
16525 git-shell: accept "git foo" form
16530 git-read-tree: document -v option.
16533 diff: reset color before printing newline
16536 Version v1.5.5.4; changes since v1.5.5.3:
16537 -----------------------------------------
16539 Björn Steinbrink (1):
16540 name-rev: Fix segmentation fault when using --all
16542 Junio C Hamano (1):
16546 git-for-each-ref.txt: minor improvements
16548 Michael Dressel (1):
16549 describe: match pattern for lightweight tags too
16552 Version v1.5.5.3; changes since v1.5.5.2:
16553 -----------------------------------------
16555 Christian Couder (1):
16556 bisect: print an error message when "git rev-list --bisect-vars" fails
16559 git-bisect.sh: don't accidentally override existing branch "bisect"
16560 Documentation/git-bundle.txt: fix synopsis
16561 commit --interactive: properly update the index before commiting
16563 Horst H. von Brand (1):
16564 Fix recipient santitization
16567 send-email: specify content-type of --compose body
16568 send-email: rfc2047-quote subject lines with non-ascii characters
16571 Revert "filter-branch: subdirectory filter needs --full-history"
16573 Junio C Hamano (3):
16574 Release Notes for 1.5.5.2
16575 show-branch --current: do not barf on detached HEAD
16579 gitweb: only display "next" links in logs if there is a next page
16581 Michele Ballabio (1):
16582 Documentation: fix graph in git-rev-parse.txt
16585 builtin-fast-export: Only output a single parent per line
16588 Version v1.5.5.2; changes since v1.5.5.1:
16589 -----------------------------------------
16591 A Large Angry SCM (1):
16592 git-repack: re-enable parsing of -n command line option
16595 Use "=" instead of "==" in condition as it is more portable
16596 Fix use after free() in builtin-fetch
16599 post-receive-email: fix accidental removal of a trailing space in signature line
16602 copy.c: copy_fd - correctly report write errors
16603 archive.c: format_subst - fixed bogus argument to memchr
16606 git-clone.txt: Adjust note to --shared for new pruning behavior of git-gc
16609 Remove 'header' from --signoff option description
16611 Dmitry Potapov (1):
16612 git-gc --prune is deprecated
16614 Dustin Sallings (1):
16615 Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
16617 Florian Ragwitz (1):
16618 filter-branch: Documentation fix.
16621 diff-options.txt: document the new "--dirstat" option
16624 Add missing "short" alternative to --date in rev-list-options.txt
16627 Documentation/git-describe.txt: make description more readable
16630 Don't force imap.host to be set when imap.tunnel is set
16631 t5516: remove ambiguity test (1)
16632 doc/git-gc: add a note about what is collected
16633 push: allow unqualified dest refspecs to DWIM
16634 remote: create fetch config lines with '+'
16635 fix reflog approxidate parsing bug
16636 cvsimport: always pass user data to "system" as a list
16637 checkout: don't rfc2047-encode oneline on detached HEAD
16638 doc: clarify definition of "update" for git-add -u
16639 doc/git-daemon: s/uploadarchive/uploadarch/
16640 git-am: fix typo in usage message
16643 wt-status.h: declare global variables as extern
16644 rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
16647 git-filter-branch: Clarify file removal example.
16648 git-show.txt: Not very stubby these days.
16650 Junio C Hamano (3):
16651 write-tree: properly detect failure to write tree objects
16652 clone: detect and fail on excess parameters
16653 fetch-pack: brown paper bag fix
16655 Linus Torvalds (1):
16656 fetch-pack: do not stop traversing an already parsed commit
16659 Linked glossary from cvs-migration page
16661 Matthew Ogilvie (1):
16662 gitattributes: Fix subdirectory attributes specified from root directory
16665 svn-git: Use binmode for reading/writing binary rev maps
16668 diff options documentation: refer to --diff-filter in --name-status
16671 Amend git-push refspec documentation
16673 Shawn O. Pearce (1):
16674 Clarify repack -n documentation
16676 Sitaram Chamarty (1):
16677 builtin-commit.c: add -u as short name for --untracked-files
16680 bash: Add completion for git diff --base --ours --theirs
16682 Thomas Guyot-Sionnest (1):
16683 git-svn bug with blank commits and author file
16685 martin f. krafft (2):
16686 Escape project name in regexp
16687 Escape project names before creating pathinfo URLs
16690 Version v1.5.5.1; changes since v1.5.5:
16691 ---------------------------------------
16693 Alberto Bertogli (1):
16694 builtin-apply: Show a more descriptive error on failure when opening a patch
16696 Björn Steinbrink (1):
16697 Fix section about backdating tags in the git-tag docs
16700 Fix documentation syntax of optional arguments in short options.
16701 core-tutorial.txt: Fix showing the current behaviour.
16703 Christian Couder (4):
16704 bisect: fix bad rev checking in "git bisect good"
16705 bisect: report bad rev better
16706 bisect: squelch "fatal: ref HEAD not a symref" misleading message
16707 git-bisect: make "start", "good" and "skip" succeed or fail atomically
16709 Clifford Caoile (1):
16710 Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
16712 Daniel Barkalow (1):
16713 Fix config key miscount in url.*.insteadOf
16715 Dirk Süsserott (1):
16716 Documentation/git-request-pull: Fixed a typo ("send" -> "end")
16718 Jakub Narebski (1):
16719 gitweb: Fix 'history' view for deleted files with history
16722 git-fetch: fix status output when not storing tracking ref
16725 Document option --only of git commit
16728 Clarify and fix English in "git-rm" documentation
16731 git-remote: reject adding remotes with invalid names
16733 Junio C Hamano (7):
16734 Document -w option to shortlog
16735 Documentation/git-submodule: typofix
16736 t7401: squelch garbage output
16737 rebase: do not munge commit log message
16738 git-am: minor cleanup
16739 am: POSIX portability fix
16742 Linus Torvalds (2):
16743 Ignore leading empty lines while summarizing merges
16744 git-am: cope better with an empty Subject: line
16747 git-submodule - possibly use branch name to describe a module
16750 Document that WebDAV doesn't need git on the server, and works over SSL
16752 Michele Ballabio (1):
16753 revision.c: make --date-order overriddable
16756 Force the medium pretty format on calls to git log
16759 git-submodule: Avoid 'fatal: cannot describe' message
16762 git-archive: ignore prefix when checking file attribute
16765 Clarify documentation of git-cvsserver, particularly in relation to git-shell
16768 git clean: Don't automatically remove directories when run within subdirectory
16769 git clean: Add test to verify directories aren't removed with a prefix
16772 Version v1.5.5; changes since v1.5.5-rc3:
16773 -----------------------------------------
16775 Christian Couder (2):
16776 git-gui: Update french translation
16777 test suite: remove useless TERM cruft in "t7005-editor.sh"
16780 git-svn: fix following renamed paths when tracking a single path
16783 gitk: Fix changing colors through Edit->Preferences
16785 Jakub Narebski (1):
16786 Revert "gitweb: Add 'status_str' to parse_difftree_raw_line output"
16788 Junio C Hamano (2):
16789 Fix "git apply" to correctly enforce "match at the beginning"
16793 git-fetch: Don't trigger a bus error when given the refspec "tag"
16795 Michele Ballabio (1):
16796 git-gui: use +/- instead of ]/[ to show more/less context in diff
16799 Add interactive option in rebase command completion list.
16800 Add prefix oriented completions for diff and format-patch commands.
16803 git-pack-objects.txt: Make wording slightly less ambiguous
16804 Add description of OFS_DELTA to the pack format description
16806 Shawn O. Pearce (1):
16807 git-gui: Switch keybindings for [ and ] to bracketleft and bracketright
16810 Version v1.5.5-rc3; changes since v1.5.5-rc2:
16811 ---------------------------------------------
16814 mktag.c: improve verification of tagger field and tests
16815 mktag.c: tweak validation of tagger field and adjust test script
16818 Silence cpio's "N blocks" output when cloning locally
16820 Christian Couder (1):
16821 help: Add a missing OPT_END().
16823 Damien Diederen (7):
16824 cvsserver: Respond to the 'editors' and 'watchers' commands
16825 cvsserver: Only print the file part of the filename in status header
16826 cvsserver: Do not include status output for subdirectories if -l is passed
16827 cvsserver: Add a few tests for 'status' command
16828 cvsserver: Implement update -p (print to stdout)
16829 cvsserver: Add test for update -p
16830 cvsserver: Use the user part of the email in log and annotate results
16833 git-svn: remove redundant slashes from show-ignore
16836 filter-branch: Test renaming directories in a tree-filter
16837 verify-tag: Clean up the temporary file if gpg cannot be started.
16838 t7004-tag: Skip more tests if gpg is not available.
16840 Jonathan del Strother (1):
16841 git-gui: Add shortcut keys for Show More/Less Context
16844 Allow git-cvsserver database table name prefix to be specified.
16846 Junio C Hamano (5):
16847 Add corner case tests for diff-index and diff-files
16848 diff-index: careful when inspecting work tree items
16849 diff-files: careful when inspecting work tree items
16850 Accept git aliases outside a git repository
16853 Marius Storm-Olsen (1):
16854 git-p4: Handle Windows EOLs properly after removal of p4 submit template handling.
16857 git-cvsserver: handle change type T
16859 Shawn O. Pearce (1):
16863 Describe the bug in handling filenames with funny characters in 'git add -i'
16865 veillette@yahoo.ca (1):
16866 filter-branch: Fix renaming a directory in the tree-filter
16869 Version v1.5.5-rc2; changes since v1.5.5-rc1:
16870 ---------------------------------------------
16873 t/t3800-mktag.sh: use test_must_fail rather than '!'
16875 Daniel Barkalow (2):
16876 Tighten refspec processing
16877 Fix branches file configuration
16879 Dirk Süsserott (1):
16880 Documentation: git-tag '-m'/'-F' implies '-a'
16882 Frank Lichtenheld (1):
16883 t9600-cvsimport.sh: set HOME before checking for cvsps availability
16886 imap-send: properly error out if imap.host is not set in config
16889 Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
16890 Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
16893 Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
16895 Johannes Schindelin (2):
16896 RelNotes: mention checkout/branch's --track option, too
16897 init: show "Reinit" message even in an (existing) empty repository
16900 builtin-remote: Fix missing newline at end of listing of pushed branches
16902 Julian Phillips (1):
16903 Documentation/git-checkout: Update summary to reflect current abilities
16905 Junio C Hamano (7):
16906 refspec: allow colon-less wildcard "refs/category/*"
16907 git-fetch test: test tracking fetch results, not just FETCH_HEAD
16908 test_must_fail: 129 is a valid error code from usage()
16909 Update draft release notes for 1.5.4.5
16910 Update draft release notes for 1.5.5
16911 builtin-prune: protect objects listed on the command line
16914 Michele Ballabio (3):
16915 parse-options.c: introduce OPT_DATE
16916 Add tests for git-prune
16917 builtin-prune.c: use parse_options()
16920 Always set *nongit_ok in setup_git_directory_gently()
16923 Version v1.5.5-rc1; changes since v1.5.5-rc0:
16924 ---------------------------------------------
16927 builtin-gc.c: allow disabling all auto-gc'ing by assigning 0 to gc.auto
16928 t/t7003-filter-branch.sh: use test_must_fail rather than '!'
16930 Daniel Barkalow (3):
16931 Tighten refspec processing
16935 Eyvind Bernhardsen (2):
16936 fast-import: Allow "reset" to delete a new branch without error
16937 fast-import: Document the effect of "merge" with no "from" in a commit
16939 Johannes Schindelin (1):
16940 remote show: do not show symbolic refs
16942 Junio C Hamano (10):
16943 Makefile: DIFF_OBJS is not special at all these days
16944 Makefile: flatten enumeration of headers, objects and programs
16945 t1000: use "test_must_fail git frotz", not "! git frotz"
16946 git-merge-one-file: fix longstanding stupid thinko
16947 Test: catch if trash cannot be removed
16948 Add tests to catch problems with un-unlinkable symlinks
16949 Fix read-tree not to discard errors
16950 remote.c: Fix overtight refspec validation
16951 gc --auto: raise default auto pack limit from 20 to 50
16955 Add --reverse to the git-rev-list usage string
16956 Document the sendemail.smtpserverport config variable
16957 Don't try and percent-escape existing percent escapes in git-svn URIs
16958 Make git-svn tests behave better on OS X
16960 Linus Torvalds (3):
16961 Don't update unchanged merge entries
16962 Fix possible Solaris problem in 'checkout_entry()'
16963 Make revision limiting more robust against occasional bad commit dates
16965 Marius Storm-Olsen (1):
16966 git-p4: Optimize the fetching of data from perforce.
16969 Documentation/git-merge: document subtree strategy.
16972 make it easier for people who just want to get rid of 'git gc --auto'
16974 Ralf Wildenhues (1):
16975 Improve description of git filter-branch.
16978 git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'
16979 git-p4: Use P4EDITOR environment variable when set
16982 Version v1.5.5-rc0; changes since v1.5.4.7:
16983 -------------------------------------------
16985 Adam Piątyszek (1):
16986 git-gui: Add option for changing the width of the commit message text box
16989 Fix builtin checkout crashing when given an invalid path
16990 Fix test for cleanup failure in t7300 on Windows
16991 Do not use GUID on dir in git init --shared=all on FreeBSD
16992 git-gui: update russian translation
16994 Alexandre Julliard (5):
16995 git.el: Support for showing unknown/ignored directories.
16996 git.el: Added a command to amend a commit.
16997 git.el: Check for existing buffers on revert.
16998 git.el: Better handling of subprocess errors.
16999 git.el: Do not display empty directories.
17001 Andreas Ericsson (1):
17002 pack-objects: Add runtime detection of online CPU's
17004 Brandon Casey (13):
17005 builtin-reflog.c: fix typo that accesses an unset variable
17006 Add compat/fopen.c which returns NULL on attempt to open directory
17007 builtin-reflog.c: don't install new reflog on write failure
17008 reflog-delete: parse standard reflog options
17009 git-reflog: add option --rewrite to update reflog entries while expiring
17010 refs.c: make close_ref() and commit_ref() non-static
17011 git-reflog: add option --updateref to write the last reflog sha1 into the ref
17012 git-stash: add new 'drop' subcommand
17013 git-stash: add new 'pop' subcommand
17014 pack-objects: Print a message describing the number of threads for packing
17015 t3903-stash.sh: Add missing '&&' to body of testcase
17016 git-reflog.txt: Document new commands --updateref and --rewrite
17017 t3903-stash.sh: Add tests for new stash commands drop and pop
17020 compat: Add simplified merge sort implementation from glibc
17023 gitweb: Make use of the $git_dir variable at sub git_get_project_url_list
17024 gitweb: Use the config file to set repository owner's name.
17027 Eliminate confusing "won't bisect on seeked tree" failure
17030 Make builtin-reset.c use parse_options.
17032 Charles Bailey (6):
17033 Tidy up git mergetool's backup file behaviour
17034 Changed an internal variable of mergetool to support custom commands
17035 Teach git mergetool to use custom commands defined at config time
17036 Add a very basic test script for git mergetool
17037 git-mergetool documentaiton: show toolnames in typewriter font
17038 merge-tool documentation: describe custom command usage
17040 Christian Couder (17):
17041 help: make 'git-help--browse' usable outside 'git-help'.
17042 help--browse: add '--config' option to check a config option for a browser.
17043 Rename 'git-help--browse.sh' to 'git-web--browse.sh'.
17044 instaweb: use 'git-web--browse' to launch browser.
17045 config: add test cases for empty value and no value config variables.
17046 Documentation: instaweb: add 'git-web--browse' information.
17047 web--browse: Add a few quotes in 'init_browser_path'.
17048 Documentation: add 'git-web--browse.txt' and simplify other docs.
17049 help.c: use 'git_config_string' to get 'help_default_format'.
17050 run-command: Redirect stderr to a pipe before redirecting stdout to stderr
17051 help: add "man.viewer" config var to use "woman" or "konqueror"
17052 Documentation: help: describe 'man.viewer' config variable
17053 help: implement multi-valued "man.viewer" config option
17054 Documentation: help: explain 'man.viewer' multiple values
17055 help: warn if specified 'man.viewer' is unsupported, instead of erroring out
17056 web--browse: use custom commands defined at config time
17057 Documention: web--browse: add info about "browser.<tool>.cmd" config var
17059 Christian Stimming (4):
17060 git-gui: (i18n) Fix a bunch of still untranslated strings.
17061 git-gui: Update German translation.
17062 git-gui: (i18n) Add newly added translation strings to template.
17063 git-gui: Update German translation.
17065 Clemens Buchacher (2):
17066 http-push: push <remote> :<branch> deletes remote branch
17067 http-push: add regression tests
17069 Daniel Barkalow (33):
17070 Test :/string form for checkout
17071 Reduce the number of connects when fetching
17072 Allow callers of unpack_trees() to handle failure
17073 Add flag to make unpack_trees() not print errors.
17074 Send unpack-trees debugging output to stderr
17075 Discard "deleted" cache entries after using them to update the working tree
17076 Add "skip_unmerged" option to unpack_trees.
17077 Build-in merge-recursive
17078 Move create_branch into a library file
17079 Use diff -u instead of diff in t7201
17080 Library function to check for unmerged index entries
17081 Move code to clean up after a branch change to branch.c
17083 Clean up reporting differences on branch switch
17084 API documentation for remote.h
17085 Add more tests for format-patch
17086 Improve message-id generation flow control for format-patch
17087 Export some email and pretty-printing functions
17088 Use ALLOC_GROW in remote.{c,h}
17089 Add a --cover-letter option to format-patch
17090 Add tests for extra headers in format-patch
17091 Fix format.headers not ending with a newline
17092 Combine To: and Cc: headers
17093 Support a --cc=<email> option in format-patch
17094 Resolve value supplied for no-colon push refspecs
17095 builtin-checkout.c: Remove unused prefix arguments in switch_branches path
17096 Add support for url aliases in config files
17097 Add API access to shortlog
17098 Improve collection of information for format-patch --cover-letter
17099 Always use the current connection's remote ref list in git protocol
17100 Use diff_tree() directly in making cover letter
17101 Write index file on any checkout of files
17102 Write diff output to a file in struct diff_options
17105 gitk: Don't show local changes when we there is no work tree
17108 git-send-email: Generalize auto-cc recipient mechanism.
17111 git.el: Set process-environment instead of invoking env
17114 cleanup: remove unused git_checkout_config
17115 whatchanged documentation: share description of --pretty with others
17116 specify explicit "--pretty=medium" with `git log/show/whatchanged`
17117 log/show/whatchanged: introduce format.pretty configuration
17119 Dmitry Potapov (3):
17120 git-web--browse: do not start the browser with nohup
17121 Make private quote_path() in wt-status.c available as quote_path_relative()
17122 git-clean: correct printing relative path
17125 git-svn: improve repository URL matching when following parents
17127 Florian La Roche (1):
17128 gitweb: Make feed entries point to commitdiff view
17130 Frank Lichtenheld (1):
17131 gc: Add --quiet option
17134 gitk: properly deal with tag names containing / (slash)
17135 git-merge-index documentation: clarify synopsis
17136 builtin-tag.c: remove cruft
17137 hash-object: cleanup handling of command line options
17139 Jakub Narebski (11):
17140 gitweb: Fix displaying unchopped argument in chop_and_escape_str
17141 gitweb: Add new option -nohtml to quot_xxx subroutines
17142 gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form
17143 gitweb: Fix bugs in git_search_grep_body: it's length(), not len()
17144 gitweb: Better cutting matched string and its context
17145 Add '--fixed-strings' option to "git log --grep" and friends
17146 gitweb: Change parse_commits signature to allow for multiple options
17147 gitweb: Simplify fixed string search
17148 Documentation: Remove --{min,max}-age option from git-log(1)
17149 gitweb: Mark first match when searching commit messages
17150 gitweb: Fix and simplify pickaxe search
17153 Add a BuildRequires for gettext in the spec file.
17155 Jason McMullan (1):
17156 Remove $Id: ..$ $Header: ..$ etc from +ko and +k files during import
17159 git-web--browse: fix misplaced quote in init_browser_path()
17160 git-help--browse: improve browser support under OS X
17161 builtin-checkout.c: fix possible usage segfault
17162 branch: optionally setup branch.*.merge from upstream local branches
17163 doc: documentation update for the branch track changes
17164 Correct git-pull documentation
17165 send-email: fix In-Reply-To regression
17166 pull: pass --strategy along to to rebase
17168 Jean-Luc Herren (1):
17169 fast-import: exit with proper message if not a git dir
17172 allow suppressing of global and system config
17173 fix config reading in tests
17174 hard-code the empty tree object
17175 add--interactive: handle initial commit better
17176 git_config_*: don't assume we are parsing a config file
17177 t3404: use configured shell instead of /bin/sh
17178 diff: fix java funcname pattern for solaris
17179 t9001: enhance fake sendmail test harness
17180 send-email: test compose functionality
17182 make alias lookup a public, procedural function
17183 help: respect aliases
17184 use build-time SHELL_PATH in test scripts
17185 rename: warn user when we have turned off rename detection
17186 allow git-am to run in a subdirectory
17187 Add a test for read-tree -u --reset with a D/F conflict
17188 gitk: make autoselect optional
17189 tr portability fixes
17190 t0050: perl portability fix
17191 more tr portability test script fixes
17192 grep portability fix: don't use "-e" or "-q"
17193 remove use of "tail -n 1" and "tail -1"
17194 add test_cmp function for test scripts
17195 t4020: don't use grep -a
17196 t6000lib: tr portability fix
17197 add NO_EXTERNAL_GREP build option
17198 filter-branch: don't use xargs -0
17199 filter-branch: use $SHELL_PATH instead of 'sh'
17200 t9112: add missing #!/bin/sh header
17201 t7505: use SHELL_PATH in hook
17202 t6000lib: re-fix tr portability
17205 Avoid unnecessary "if-before-free" tests.
17208 Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR
17209 Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR
17211 Johannes Schindelin (21):
17212 Teach "git reflog" a subcommand to delete single entries
17213 Also use unpack_trees() in do_diff_cache()
17214 Fix "git clone" for git:// protocol
17215 Adjust .gitignore for 5884f1(Rename 'git-help--browse.sh'...)
17216 Introduce the config variable pack.packSizeLimit
17217 bisect view: check for MinGW32 and MacOSX in addition to X11
17218 xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
17219 xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
17220 completion: support format-patch's --cover-letter option
17221 path-list: add functions to work with unsorted lists
17222 parseopt: add flag to stop on first non option
17223 Test "git remote show" and "git remote prune"
17224 Make git-remote a builtin
17225 builtin-remote: prune remotes correctly that were added with --mirror
17226 Fix make_absolute_path() for parameters without a slash
17227 format-patch: use the diff options for the cover letter, too
17228 format-patch: wrap cover-letter's shortlog sensibly
17229 remote show: Clean up connection correctly if object fetch wasn't done
17230 remote: fix "update [group...]"
17231 builtin remote rm: remove symbolic refs, too
17232 gc: call "prune --expire 2.weeks.ago" by default
17235 Fix misuse of prefix_path()
17236 gitk: Heed the lines of context in merge commits
17237 Technical documentation of the run-command API.
17238 prefix_path: use is_absolute_path() instead of *orig == '/'
17239 start_command(), .in/.out/.err = -1: Callers must close the file descriptor
17240 start_command(), if .in/.out > 0, closes file descriptors, not the callers
17241 git-submodule summary: fix that some "wc" flavors produce leading spaces
17244 man pages are littered with .ft C and others
17245 shortlog: do not require to run from inside a git repository
17247 Junichi Uekawa (1):
17248 git-blame.el: show the when, who and what in the minibuffer.
17250 Junio C Hamano (93):
17251 index: be careful when handling long names
17252 Avoid running lstat(2) on the same cache entry.
17253 read-cache.c: fix a couple more CE_REMOVE conversion
17254 read-cache.c: introduce is_racy_timestamp() helper
17256 Sane use of test_expect_failure
17257 test: reword the final message of tests with known breakages
17258 known breakage: revision range computation with clock skew
17259 fix misuse of prefix_path()
17260 builtin-apply.c: refactor small part that matches context
17261 builtin-apply.c: restructure "offset" matching
17262 builtin-apply.c: push match-beginning/end logic down
17263 builtin-apply.c: make it more line oriented
17264 builtin-apply.c: optimize match_beginning/end processing a bit.
17265 builtin-apply.c: mark common context lines in lineinfo structure.
17266 builtin-apply.c: clean-up apply_one_fragment()
17267 builtin-apply.c: simplify calling site to apply_line()
17268 builtin-apply.c: do not feed copy_wsfix() leading '+'
17269 builtin-apply.c: move copy_wsfix() function a bit higher.
17270 builtin-apply.c: pass ws_rule down to match_fragment()
17271 git-apply --whitespace=fix: fix whitespace fuzz introduced by previous run
17272 core.whitespace: cr-at-eol
17273 Documentation/SubmittingPatches: Instruct how to use [PATCH] Subject header
17274 Documentation/SubmittingPatches: discuss first then submit
17275 Documentation/SubmittingPatches: What's Acked-by and Tested-by?
17276 Make error messages from cherry-pick/revert more sensible
17277 setup: sanitize absolute and funny paths in get_pathspec()
17278 git-add: adjust to the get_pathspec() changes.
17279 builtin-mv: minimum fix to avoid losing files
17280 gitignore(5): Allow "foo/" in ignore list to match directory "foo"
17281 gitignore: lazily find dtype
17282 Define the project whitespace policy
17283 apply: do not barf on patch with too large an offset
17284 Update the main documentation (stale notes section)
17285 .mailmap: adjust to a recent patch application glitch.
17286 diff --relative: output paths as relative to the current subdirectory
17287 diff --relative: help working in a bare repository
17288 checkout: notice when the switched branch is behind or forked
17289 Documentation/SubmittingPatches - a suggested patch flow
17290 Sync with 1.5.4.2 and start 1.5.5 Release Notes
17291 sending errors to stdout under $PAGER
17292 merge-recursive: split low-level merge functions out.
17293 expose a helper function peel_to_type().
17294 checkout: tone down the "forked status" diagnostic messages
17295 checkout: work from a subdirectory
17296 git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()
17297 checkout: updates to tracking report
17298 gitweb: Better chopping in commit search results
17299 Add merge-subtree back
17300 checkout: show progress when checkout takes long time while switching branches
17301 ws_fix_copy(): move the whitespace fixing function to ws.c
17302 checkout: error out when index is unmerged even with -m
17303 diff --dirstat: saner handling of binary and unmerged files
17304 url rewriting: take longest and first match
17305 git-apply --whitespace=fix: fix off by one thinko
17306 Revert "pack-objects: Print a message describing the number of threads for packing"
17307 git-remote: do not complain on multiple URLs for a remote
17308 format-patch: remove a leftover debugging message
17309 tests: introduce test_must_fail
17310 Update draft release notes for 1.5.5
17311 t6024: move "git reset" to prepare for a test inside the test itself
17312 CodingGuidelines: spell out how we use grep in our scripts
17313 find_unique_abbrev(): redefine semantics
17314 Clean up find_unique_abbrev() callers
17315 diff-lib.c: constness strengthening
17316 diff: make sure work tree side is shown as 0{40} when different
17317 Update draft release notes for 1.5.5
17318 describe --always: fall back to showing an abbreviated object name
17319 git-describe: use tags found in packed-refs correctly
17320 describe: fix --long output
17321 describe: re-fix display_name()
17322 t6120 (describe): check --long properly
17323 Revert "receive-pack: use strict mode for unpacking objects"
17324 Revert "unpack-objects: prevent writing of inconsistent objects"
17325 fsck.c: fix bogus "empty tree" check
17326 am: read from the right mailbox when started from a subdirectory
17327 am: remove support for -d .dotest
17329 get_pathspec(): die when an out-of-tree path is given
17330 Revert part of 744dacd (builtin-mv: minimum fix to avoid losing files)
17331 Revert part of 1abf095 (git-add: adjust to the get_pathspec() changes)
17332 Revert part of d089eba (setup: sanitize absolute and funny paths in get_pathspec())
17333 git-clean: add tests for relative path
17334 send-email: --no-signed-off-cc should suppress 'sob' cc
17335 traverse_trees_recursive(): propagate merge errors up
17336 git-gui: Simplify MSGFMT setting in Makefile
17337 Documentation/config: typofix
17338 Documentation/git-help: typofix
17339 read-tree() and unpack_trees(): use consistent limit
17340 Redo "add test_cmp function for test scripts"
17341 git-gui: Improve directions regarding POT update in po/README
17342 Resurrect git-rerere to contrib/examples
17343 Update draft release notes for 1.5.5
17345 Karl Hasselström (2):
17346 git-svn: Don't call git-repack anymore
17347 Let "git svn" run "git gc --auto" occasionally
17350 bash: Properly quote the GIT_DIR at all times to fix subdirectory paths with spaces
17352 Kristian Høgsberg (1):
17353 wt-status.c: no need for dup() dance anymore
17356 Simplify setup of $GIT_DIR in git-sh-setup.sh
17358 Linus Torvalds (22):
17359 Make on-disk index representation separate from in-core one
17360 Make run_diff_index() use unpack_trees(), not read_tree()
17361 Create pathname-based hash-table lookup into index
17362 Add "--dirstat" for some directory statistics
17363 gitk: learn --show-all output
17364 Add "--show-all" revision walker flag for debugging
17365 Fix name re-hashing semantics
17366 Name hash fixups: export (and rename) remove_hash_entry
17367 Use helper function for copying index entry information
17368 Be more verbose when checkout takes a long time
17369 Add 'df_name_compare()' helper function
17370 Make 'traverse_tree()' use linked structure rather than 'const char *base'
17371 Add return value to 'traverse_tree()' callback
17372 Make 'traverse_trees()' traverse conflicting DF entries in parallel
17373 Move 'unpack_trees()' over to 'traverse_trees()' interface
17374 Fix tree-walking compare_entry() in the presense of --prefix
17375 Add 'const' where appropriate to index handling functions
17376 Make 'unpack_trees()' take the index to work on as an argument
17377 Make 'unpack_trees()' have a separate source and destination index
17378 unpack_trees(): minor memory leak fix in unused destination index
17379 unpack_trees(): fix diff-index regression.
17380 Fix recent 'unpack_trees()'-related changes breaking 'git stash'
17382 Marco Costalba (1):
17383 Avoid a useless prefix lookup in strbuf_expand()
17386 git-submodule - Allow adding a submodule in-place
17388 Martin Koegler (28):
17389 git-fsck: report missing author/commit line in a commit as an error
17390 parse_object_buffer: don't ignore errors from the object specific parsing functions
17391 deref_tag: handle return value NULL
17392 deref_tag: handle tag->tagged = NULL
17393 check return code of prepare_revision_walk
17394 read_object_with_reference: don't read beyond the buffer
17395 get_sha1_oneline: check return value of parse_object
17396 mark_blob/tree_uninteresting: check for NULL
17397 reachable.c::add_one_tree: handle NULL from lookup_tree
17398 list-objects.c::process_tree/blob: check for NULL
17399 check results of parse_commit in merge_bases
17400 process_tag: handle tag->tagged == NULL
17401 reachable.c::process_tree/blob: check for NULL
17402 revision.c: handle tag->tagged == NULL
17403 parse_commit: don't fail, if object is NULL
17404 check return value from parse_commit() in various functions
17405 peel_onion: handle NULL
17406 add generic, type aware object chain walker
17407 builtin-fsck: move away from object-refs to fsck_walk
17408 Remove unused object-ref code
17409 builtin-fsck: reports missing parent commits
17410 builtin-fsck: move common object checking code to fsck.c
17411 add common fsck error printing function
17412 unpack-object: cache for non written objects
17413 unpack-objects: prevent writing of inconsistent objects
17414 index-pack: introduce checking mode
17415 receive-pack: use strict mode for unpacking objects
17416 fetch-pack: check parse_commit/object results
17418 Matthias Kestenholz (1):
17419 Add color.ui variable which globally enables colorization if set
17421 Michael Witten (3):
17422 git-send-email: ssh/login style password requests
17423 git-send-email: SIG{TERM,INT} handlers
17424 git-send-email: Better handling of EOF
17427 Add compat/snprintf.c for systems that return bogus
17428 autoconf: Test FREAD_READS_DIRECTORIES
17430 Michele Ballabio (7):
17431 gitk: Fix "Key bindings" message
17432 git-gui: fix typo in lib/spellcheck.tcl
17433 builtin-for-each-ref.c: fix typo in error message
17434 gitk: Mark another string for translation
17435 git-gui: update Italian translation
17436 gitk: initial Italian translation
17437 git-gui: remove spurious "fuzzy" attributes in po/it.po
17440 Work around curl-gnutls not liking to be reinitialized
17441 Add test for git rebase --abort
17442 Documentation/git-rebase.txt: Add --strategy to synopsys
17443 git rebase --abort: always restore the right commit
17444 t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge
17447 git-clean: handle errors if removing files fails
17448 Improve t6029 to check the real "subtree" case
17449 Update Hungarian translation. 100% completed.
17450 git-gui: Updated Hungarian translation (e5fba18)
17452 Nanako Shiraishi (2):
17453 git-gui: Update Japanese translation
17454 git-gui: Update Japanese translation
17457 factorize revindex code out of builtin-pack-objects.c
17458 make verify_one_pack() a bit less wrong wrt packed_git structure
17459 fix unimplemented packed_object_info_detail() features
17460 add storage size output to 'git verify-pack -v'
17461 pack-objects: proper pack time stamping with --max-pack-size
17464 git-commit: support variable number of hook arguments
17465 git-commit: set GIT_EDITOR=: if editor will not be launched
17466 git-commit: Refactor creation of log message.
17467 git-commit: add a prepare-commit-msg hook
17469 Paul Mackerras (3):
17470 gitk: Only restore window size from ~/.gitk, not position
17471 gitk: Avoid Tcl error when switching views
17472 gitk: Default to using po2msg.sh if msgfmt doesn't grok --tcl, -l and -d
17474 Pekka Kaitaniemi (1):
17475 gitk: Add horizontal scrollbar to the diff view
17477 Peter Karlsson (2):
17478 git-gui: Regenerated po template and merged translations with it
17479 git-gui: updated Swedish translation
17482 gitweb: Clearly distinguish regexp / exact match searches
17484 Philipp A. Hartmann (1):
17485 git-gui: if a background colour is set, set foreground colour as well
17487 Philippe Bruhat (3):
17488 cvsimport: have default merge regex allow for dashes in the branch name
17489 cvsimport: allow for multiple -M options
17490 cvsimport: document that -M can be used multiple times
17492 Pierre Habouzit (4):
17493 git-describe: Add a --match option to limit considered tags.
17494 git-name-rev: add a --(no-)undefined option.
17495 parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse --parseopt
17496 parse-options: new option type to treat an option-like parameter as an argument.
17499 git-submodule summary: code framework
17500 git-submodule summary: show commit summary
17501 git-submodule summary: limit summary size
17502 git-submodule summary: documentation
17503 git-submodule summary: test
17505 Rafael Garcia-Suarez (1):
17506 Make git-remote.perl "use strict" compliant
17508 Ralf Wildenhues (1):
17511 Robin Rosenberg (2):
17512 Make blame accept absolute paths
17513 Improve bash prompt to detect various states like an unfinished merge
17516 bash: add git-branch options
17517 bash: git-branch -d and -m lists only local branches
17518 bash: remove unnecessary conditions when checking for subcommands
17519 bash: refactor searching for subcommands on the command line
17520 bash: add new 'git stash' subcommands
17521 bash: add 'git svn' subcommands and options
17522 bash: use __gitdir when completing 'git rebase' options
17523 bash: fix long option with argument double completion
17524 update 'git rebase' documentation
17526 Samuel Tardieu (1):
17527 "remote update": print remote name being fetched from
17530 git-bundle.txt: Add different strategies to create the bundle
17531 git-describe: --long shows the object name even for a tagged commit
17532 clone: support cloning full bundles
17534 Sebastian Noack (1):
17535 git-svn: Don't prompt for client cert password everytime.
17537 Shawn O. Pearce (37):
17538 git-gui: Automatically spell check commit messages as the user types
17539 git-gui: Paper bag fix bad string length call in spellchecker
17540 git-gui: Correct size of dictionary name widget in options dialog
17541 Include annotated tags in fast-import crash reports
17542 Include the fast-import marks table in crash reports
17543 Finish current packfile during fast-import crash handler
17544 Update fast-import documentation to discuss crash reports
17545 Teach git-grep --name-only as synonym for -l
17546 git-gui: Ensure all spellchecker 'class' variables are initialized
17547 git-gui: Remove explicit references to 'aspell' in message strings
17548 git-gui: Only bind the spellcheck popup suggestion hook once
17549 git-gui: Catch and display aspell startup failures to the user
17550 git-gui: Gracefully display non-aspell version errors to users
17551 git-gui: Shorten Aspell version strings to just Aspell version number
17552 Optimize peel_ref for the current ref of a for_each_ref callback
17553 Teach git-describe to use peeled ref information when scanning tags
17554 Avoid accessing non-tag refs in git-describe unless --all is requested
17555 Teach git-describe --exact-match to avoid expensive tag searches
17556 Use git-describe --exact-match in bash prompt on detached HEAD
17557 Teach git-describe to verify annotated tag names before output
17558 Remove unused variable in builtin-fetch find_non_local_tags
17559 Remove unnecessary delaying of free_refs(ref_map) in builtin-fetch
17560 Ensure tail pointer gets setup correctly when we fetch HEAD only
17561 Allow builtin-fetch's find_non_local_tags to append onto a list
17562 Free the path_lists used to find non-local tags in git-fetch
17563 Teach upload-pack to log the received need lines to an fd
17564 Make git-fetch follow tags we already have objects for sooner
17565 Teach git-fetch to grab a tag at the same time as a commit
17566 Don't allow git-describe failures to go unnoticed in t6120
17567 Test for packed tags in git-describe output
17568 Add git-describe test for "verify annotated tag names on output"
17569 git-pack-objects: Automatically pack annotated tags if object was packed
17570 Teach fetch-pack/upload-pack about --include-tag
17571 Teach git-fetch to exploit server side automatic tag following
17572 bash: Remove completion of core.legacyheaders option
17573 git-gui: Don't translate the special Apple menu
17574 git-gui: Adjusted Japanese translation to updated POT
17576 Simon Hausmann (7):
17577 git-p4: Fix submit user-interface.
17578 git-p4: Ensure the working directory and the index are clean before "git-p4 rebase"
17579 git-p4: Remove --log-substitutions feature.
17580 git-p4: Clean up git-p4 submit's log message handling.
17581 git-p4: Removed git-p4 submit --direct.
17582 git-p4: git-p4 submit cleanups.
17583 git-p4: Fix import of changesets with file deletions
17585 Steffen Prohaska (4):
17586 safecrlf: Add mechanism to warn about irreversible crlf conversions
17587 gitk: Add checkbutton to ignore space changes
17588 t4014: Replace sed's non-standard 'Q' by standard 'q'
17589 Add tests for filesystem challenges (case and unicode normalization)
17592 bash: Add more long options to be completed with "git --<TAB>"
17595 Add `git svn blame' command
17598 git-p4: Fix indentation from tab to spaces
17601 git-p4: Fix an obvious typo
17602 git-p4: support exclude paths
17604 Tor Arvid Lund (1):
17605 git-p4: Support usage of perforce client spec
17607 Uwe Kleine-König (1):
17608 rev-list: add --branches, --tags and --remotes
17611 Add an --argscmd flag to get the list of refs to show
17614 git-gui: translate the remaining messages in zh_cn.po to chinese
17617 Version v1.5.4.7; changes since v1.5.4.6:
17618 -----------------------------------------
17620 Junio C Hamano (2):
17621 gitweb: do not run "git diff" that is Porcelain
17625 Version v1.5.4.6; changes since v1.5.4.5:
17626 -----------------------------------------
17628 A Large Angry SCM (1):
17629 git-repack: re-enable parsing of -n command line option
17631 Alberto Bertogli (1):
17632 builtin-apply: Show a more descriptive error on failure when opening a patch
17635 copy.c: copy_fd - correctly report write errors
17636 archive.c: format_subst - fixed bogus argument to memchr
17638 Björn Steinbrink (1):
17639 Fix section about backdating tags in the git-tag docs
17642 Fix documentation syntax of optional arguments in short options.
17643 core-tutorial.txt: Fix showing the current behaviour.
17645 Christian Couder (4):
17646 bisect: fix bad rev checking in "git bisect good"
17647 bisect: report bad rev better
17648 bisect: squelch "fatal: ref HEAD not a symref" misleading message
17649 git-bisect: make "start", "good" and "skip" succeed or fail atomically
17651 Clifford Caoile (1):
17652 Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
17655 Remove 'header' from --signoff option description
17657 Dirk Süsserott (1):
17658 Documentation/git-request-pull: Fixed a typo ("send" -> "end")
17660 Dustin Sallings (1):
17661 Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
17663 Florian Ragwitz (1):
17664 filter-branch: Documentation fix.
17667 Documentation/git-describe.txt: make description more readable
17670 t5516: remove ambiguity test (1)
17671 fix reflog approxidate parsing bug
17672 cvsimport: always pass user data to "system" as a list
17673 doc: clarify definition of "update" for git-add -u
17674 doc/git-daemon: s/uploadarchive/uploadarch/
17675 git-am: fix typo in usage message
17678 Document option --only of git commit
17679 wt-status.h: declare global variables as extern
17680 rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
17683 Clarify and fix English in "git-rm" documentation
17685 Junio C Hamano (7):
17686 Fix "git apply" to correctly enforce "match at the beginning"
17687 Document -w option to shortlog
17688 git-am: minor cleanup
17689 am: POSIX portability fix
17690 write-tree: properly detect failure to write tree objects
17691 git-shell: accept "git foo" form
17694 Linus Torvalds (2):
17695 Ignore leading empty lines while summarizing merges
17696 git-am: cope better with an empty Subject: line
17699 Linked glossary from cvs-migration page
17701 Matthew Ogilvie (1):
17702 gitattributes: Fix subdirectory attributes specified from root directory
17705 svn-git: Use binmode for reading/writing binary rev maps
17707 Michele Ballabio (1):
17708 revision.c: make --date-order overriddable
17711 diff options documentation: refer to --diff-filter in --name-status
17714 builtin-fast-export: Only output a single parent per line
17717 git-archive: ignore prefix when checking file attribute
17720 Clarify documentation of git-cvsserver, particularly in relation to git-shell
17722 Sitaram Chamarty (1):
17723 builtin-commit.c: add -u as short name for --untracked-files
17725 Thomas Guyot-Sionnest (1):
17726 git-svn bug with blank commits and author file
17729 Version v1.5.4.5; changes since v1.5.4.4:
17730 -----------------------------------------
17732 Andy Whitcroft (1):
17733 shortlog: take the first populated line of the description
17736 git-new-workdir: Share SVN meta data between work dirs and the repository
17739 t/t3800-mktag.sh: use test_must_fail rather than '!'
17741 Clemens Buchacher (1):
17742 merge-recursive: handle file mode changes
17744 Daniel Barkalow (2):
17745 Tighten refspec processing
17746 Fix branches file configuration
17749 git-svn: don't blindly append '*' to branch/tags config
17752 Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
17754 Jakub Narebski (1):
17755 gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form
17758 t0021: tr portability fix for Solaris
17759 Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
17761 Johannes Schindelin (3):
17762 launch_editor(): allow spaces in the filename
17763 git fetch: Take '-n' to mean '--no-tags'
17764 merge-file: handle empty files gracefully
17767 Make man page building quiet when DOCBOOK_XSL_172 is defined
17769 Junio C Hamano (9):
17770 filter-branch: handle "disappearing tree" case correctly in subdir filter
17771 git-pull documentation: warn about the option order
17772 quiltimport: fix misquoting of parsed -p<num> parameter
17773 format-patch: generate MIME header as needed even when there is format.header
17774 rebase -m: do not trigger pre-commit verification
17775 Start draft ReleaseNotes for 1.5.4.5
17776 git-fetch test: test tracking fetch results, not just FETCH_HEAD
17777 Update draft release notes for 1.5.4.5
17780 Linus Torvalds (1):
17781 rev-parse: fix meaning of rev~ vs rev~0.
17783 Marc-Andre Lureau (2):
17784 git-svn: fix find-rev error message when missing arg
17785 git-cvsimport: fix merging with remote parent branch
17788 git rebase --abort: always restore the right commit
17790 Pierre Habouzit (1):
17791 git-quiltimport: better parser to grok "enhanced" series files.
17794 Minor wording changes in the keyboard descriptions in git-add --interactive.
17797 Version v1.5.4.4; changes since v1.5.4.3:
17798 -----------------------------------------
17801 Really make the LF after reset in fast-import optional
17803 Björn Steinbrink (1):
17804 receive-pack: Initialize PATH to include exec-dir.
17807 builtin-reflog.c: don't install new reflog on write failure
17810 Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest
17812 Caio Marcelo de Oliveira Filho (1):
17813 filter-branch documentation: non-zero exit status in command abort the filter
17816 Eliminate confusing "won't bisect on seeked tree" failure
17818 Daniel Barkalow (3):
17819 Use a single implementation and API for copy_file()
17820 Don't use GIT_CONFIG in t5505-remote
17821 Correct name of diff_flush() in API documentation
17824 templates/Makefile: don't depend on local umask setting
17825 git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options
17828 rev-parse: fix potential bus error with --parseopt option spec handling
17829 send-email: fix In-Reply-To regression
17832 revert: actually check for a dirty index
17835 Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR
17836 Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR
17838 Johannes Schindelin (4):
17839 http-push: avoid invalid memory accesses
17840 http-push: do not get confused by submodules
17841 http-push: avoid a needless goto
17842 cvsexportcommit: be graceful when "cvs status" reorders the arguments
17845 daemon: send more error messages to the syslog
17846 daemon: ensure that base-path is an existing directory
17849 Fix dcommit, rebase when rewriteRoot is in use
17851 Jonathan del Strother (1):
17852 Prompt to continue when editing during rebase --interactive
17854 Junio C Hamano (6):
17855 Fix "git log --merge --left-right"
17856 Start preparing for 1.5.4.4
17857 tests: introduce test_must_fail
17858 Update draft release notes for 1.5.4.4
17859 test-lib: fix TERM to dumb for test repeatability
17863 Fix incorrect wording in git-merge.txt.
17866 Set proxy override with http_init()
17867 Fix random crashes in http_cleanup()
17870 Documentation cherry-pick: Fix cut-and-paste error
17873 Documentation/git-filter-branch: add a new msg-filter example
17874 Documentation/git svn log: add a note about timezones.
17876 Pierre Habouzit (1):
17877 unquote_c_style: fix off-by-one.
17880 git-submodule: Fix typo 'url' which should be '$url'
17883 git.el: find the git-status buffer whatever its name is
17886 ident.c: reword error message when the user name cannot be determined
17888 Sebastian Noack (1):
17889 git-svn: Don't prompt for client cert password everytime.
17891 Shawn O. Pearce (6):
17892 Ensure 'make dist' compiles git-archive.exe on Cygwin
17893 Protect peel_ref fallback case from NULL parse_object result
17894 Correct fast-export file mode strings to match fast-import standard
17895 git-gui: Paper bag fix info dialog when no files are staged at commit
17896 Fix 'git remote show' regression on empty repository in 1.5.4
17897 git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails
17900 timezone_names[]: fixed the tz offset for New Zealand.
17902 Uwe Kleine-König (1):
17903 config.txt: refer to --upload-pack and --receive-pack instead of --exec
17906 Version v1.5.4.3; changes since v1.5.4.2:
17907 -----------------------------------------
17910 git-clone.sh: properly configure remote even if remote's head is dangling
17913 git-gui: support Git Gui.app under OS X 10.5
17914 send-email: squelch warning due to comparing undefined $_ to ""
17917 push: indicate partialness of error message
17918 Documentation/push: clarify matching refspec behavior
17919 push: document the status output
17920 hash: fix lookup_hash semantics
17922 Junio C Hamano (1):
17925 Kristian Høgsberg (1):
17926 Rename git-core rpm to just git and rename the meta-pacakge to git-all.
17929 Documentation/git-stash: document options for git stash list
17931 Pekka Kaitaniemi (1):
17932 Clarified the meaning of git-add -u in the documentation
17934 Shawn O. Pearce (5):
17935 git-gui: Ensure error dialogs always appear over all other windows
17936 git-gui: Paper bag fix error dialogs opening over the main window
17937 git-gui: Default TCL_PATH to same location as TCLTK_PATH
17938 git-gui: Avoid hardcoded Windows paths in Cygwin package files
17939 git-gui: Focus insertion point at end of strings in repository chooser
17941 Wincent Colaiuta (1):
17942 git-gui: relax "dirty" version detection
17945 Version v1.5.4.2; changes since v1.5.4.1:
17946 -----------------------------------------
17948 Christian Couder (8):
17949 config: add test cases for empty value and no value config variables.
17950 diff.c: replace a 'strdup' with 'xstrdup'.
17951 diff.c: remove useless check for value != NULL
17952 config: add 'git_config_string' to refactor string config variables.
17953 Add "const" qualifier to "char *pager_program".
17954 Add "const" qualifier to "char *editor_program".
17955 Add "const" qualifier to "char *excludes_file".
17956 diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver"
17958 Daniel Barkalow (1):
17959 Validate nicknames of remote branches to prohibit confusing ones
17961 David Steven Tweed (1):
17962 Make git prune remove temporary packs that look like write failures
17964 Frank Lichtenheld (1):
17965 config: Fix --unset for continuation lines
17968 builtin-commit: remove .git/SQUASH_MSG upon successful commit
17969 cvsimport: have default merge regex also match beginning of commit message
17972 Add a BuildRequires for gettext in the spec file.
17975 mailinfo: feed only one line to handle_filter() for QP input
17978 status: suggest "git rm --cached" to unstage for initial commit
17979 commit: discard index after setting up partial commit
17981 Johannes Schindelin (3):
17982 bisect: allow starting with a detached HEAD
17983 Document that the default of branch.autosetupmerge is true
17984 bisect: use verbatim commit subject in the bisect log
17987 upload-pack: Initialize the exec-path.
17990 man pages are littered with .ft C and others
17992 Junio C Hamano (31):
17993 git-pull documentation: fix markup
17994 archive-tar.c: guard config parser from value=NULL
17995 Add config_error_nonbool() helper function
17996 builtin-apply.c: guard config parser from value=NULL
17997 builtin-branch.c: guard config parser from value=NULL
17998 builtin-commit.c: guard config parser from value=NULL
17999 builtin-config.c: guard config parser from value=NULL
18000 builtin-log.c: guard config parser from value=NULL
18001 builtin-reflog.c: guard config parser from value=NULL
18002 builtin-show-branch.c: guard config parser from value=NULL
18003 builtin-tag.c: guard config parser from value=NULL
18004 connect.c: guard config parser from value=NULL
18005 convert.c: guard config parser from value=NULL
18006 diff.c: guard config parser from value=NULL
18007 git.c: guard config parser from value=NULL
18008 help.c: guard config parser from value=NULL
18009 http.c: guard config parser from value=NULL
18010 merge-recursive.c: guard config parser from value=NULL
18011 remote.c: guard config parser from value=NULL
18012 setup.c: guard config parser from value=NULL
18013 wt-status.c: guard config parser from value=NULL
18014 imap-send.c: guard config parser from value=NULL
18015 builtin-log.c: guard config parser from value=NULL
18016 config.c: guard config parser from value=NULL
18017 Revert "pack-objects: only throw away data during memory pressure"
18018 Protect get_author_ident_from_commit() from filenames in work tree
18019 diff.c: fixup garding of config parser from value=NULL
18020 diff: Fix miscounting of --check output
18021 filter-branch: handle filenames that need quoting
18022 Documentation/git-reset:
18025 Martin Koegler (1):
18026 pack-objects: only throw away data during memory pressure
18029 Work around curl-gnutls not liking to be reinitialized
18032 builtin-gc.c: guard config parser from value=NULL
18033 git clone -s documentation: force a new paragraph for the NOTE
18036 Documentation/git-reset: don't mention --mixed for selected-paths reset
18037 Documentation/git-reset: Add an example of resetting selected paths
18039 Sergei Organov (1):
18040 git-cvsimport.txt: fix '-M' description.
18042 Shawn O. Pearce (1):
18043 fast-import: check return value from unpack_entry()
18046 hg-to-git: fix parent analysis
18048 Uwe Kleine-König (1):
18049 rebase -i: accept -m as advertised in the man page
18052 Version v1.5.4.1; changes since v1.5.4:
18053 ---------------------------------------
18056 INSTALL: git-merge no longer uses cpio
18059 Documentation/git-stash.txt: Adjust SYNOPSIS command syntax (2)
18061 Junio C Hamano (3):
18062 Update stale documentation links from the main documentation.
18063 Fix "git-commit -C $tag"
18064 gitattributes: fix relative path matching
18067 git-am: fix type in its usage string
18068 git-remote documentation: fix synopsis to match description
18071 Fix typo in 'blame' documentation.
18074 Fix parsing numeric color values
18077 Version v1.5.4; changes since v1.5.4-rc5:
18078 -----------------------------------------
18081 git-relink: avoid hard linking in objects/info directory
18082 filter-branch.sh: remove temporary directory on failure
18083 filter-branch docs: remove brackets so not to imply revision arg is optional
18084 filter-branch: assume HEAD if no revision supplied
18087 gitweb: Make use of the $git_dir variable at sub git_get_project_description
18089 Christian Couder (3):
18090 Documentation: config: add "browser.<tool>.path".
18091 Documentation: help: specify supported html browsers.
18092 instaweb: use 'browser.<tool>.path' config option if it's set.
18094 Jakub Narebski (1):
18095 gitweb: Add info about $projectroot and $projects_list to gitweb/README
18097 Jean-Luc Herren (1):
18098 Documentation/git-cvsserver: Fix typo
18101 t9001: add missing && operators
18106 Johannes Schindelin (1):
18107 Add test for rebase -i with commits that do not pass pre-commit
18109 Junio C Hamano (4):
18110 reflog-expire: Avoid creating new files in a directory inside readdir(3) loop
18111 Revert "filter-branch docs: remove brackets so not to imply revision arg is optional"
18112 Fix "git checkout -b foo ':/substring'"
18115 Michele Ballabio (1):
18116 Fix typo in a comment in t/test-lib.sh
18119 git rev-parse manpage: spelling fix
18121 Shawn O. Pearce (1):
18122 Use 'printf %s $x' notation in t5401
18125 gitweb: Convert generated contents to utf8 in commitdiff_plain
18128 Version v1.5.4-rc5; changes since v1.5.4-rc4:
18129 ---------------------------------------------
18132 Make t5710 more strict when creating nested repos
18135 git-commit: exit non-zero if we fail to commit the index
18138 git-svn: default to repacking every 1000 commits
18140 Gustaf Hendeby (1):
18141 send-email, fix breakage in combination with --compose
18143 Jakub Narebski (1):
18144 autoconf: define NO_SYS_SELECT_H on systems without <sys/select.h>.
18146 Johannes Schindelin (1):
18147 pull --rebase: be cleverer with rebased upstream branches
18149 Junio C Hamano (5):
18150 git-submodule: rename shell functions for consistency
18151 git-submodule: fix subcommand parser
18152 git-submodule: add test for the subcommand parser fix
18153 Clarify that http-push being temporarily disabled with older cURL
18157 Add a missing dependency on http.h
18158 Documentation: add a bit about sendemail.to configuration
18161 git-clone -s: document problems with git gc --prune
18162 git pull manpage: don't include -n from fetch-options.txt
18165 pack-objects: Fix segfault when object count is less than thread count
18167 Pierre Habouzit (1):
18168 parse-options: catch likely typo in presense of aggregated options.
18170 Robert Schiele (2):
18171 pre-POSIX.1-2001 systems do not have <sys/select.h>
18172 Makefile: customization for supporting HP-UX
18175 git-svn(1): update instructions for resuming a git-svn clone
18177 Shawn O. Pearce (10):
18178 git-gui: Honor the standard commit-msg hook
18179 git-gui: Correct window title for hook failure dialogs
18180 git-gui: Consolidate hook execution code into a single function
18181 git-gui: Correct encoding of glossary/fr.po to UTF-8
18182 Teach fast-import to honor pack.compression and pack.depth
18183 Document the hairy gfi_unpack_entry part of fast-import
18184 git-gui: Work around random missing scrollbar in revision list
18185 git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available
18186 git-gui: Make the statistics of po2msg match those of msgfmt
18187 git-gui: Correctly cleanup msgfmt '1 message untranslated' output
18189 Steffen Prohaska (3):
18190 submodule: Document the details of the command line syntax
18191 t9400-git-cvsserver-server: Wrap setup into test case
18192 cvsserver: Fix for histories with multiple roots
18195 Version v1.5.4-rc4; changes since v1.5.4-rc3:
18196 ---------------------------------------------
18199 Correct spelling in diff.c comment
18202 close_lock_file(): new function in the lockfile API
18203 Improve use of lockfile API
18204 refs.c: rework ref_locks by abstracting from underlying struct lock_file
18205 fast-import.c: don't try to commit marks file if write failed
18207 Christian Couder (2):
18208 git-gui: Initial french translation
18209 git-gui: add french glossary: glossary/fr.po
18211 Christian Stimming (4):
18212 git-gui: Update glossary: add term "hunk"
18213 git-gui: Update German translation
18214 git-gui: Fix broken revert confirmation.
18215 git-gui: Improve German translation.
18218 Remove usage of git- (dash) commands from email hook
18219 cvsimport: remove last use of repo-config from git standard tools
18220 Update git-completion for new 'remote rm' option
18222 Dave Peticolas (1):
18223 Documentation: fix and clarify grammar in git-merge docs.
18225 Dmitry Potapov (1):
18226 treat any file with NUL as binary
18229 git-svn: handle leading/trailing whitespace from svnsync revprops
18231 Grégoire Barbier (4):
18232 http-push: disable http-push without USE_CURL_MULTI
18233 http-push: fix webdav lock leak.
18234 http-push: fail when info/refs exists and is already locked
18235 http-push and http-fetch: handle URLs without trailing /
18237 Jakub Narebski (1):
18238 autoconf: Add checking for unsetenv function
18240 Jean-Luc Herren (1):
18241 Make default pre-commit hook less noisy
18244 git-clean: fix off-by-one memory access when given no arguments
18245 color unchanged lines as "plain" in "diff --color-words"
18246 send-email: detect invocation errors earlier
18247 send-email: validate patches before sending anything
18248 send-email: add no-validate option
18251 fast-import: Don't use a maybe-clobbered errno value
18252 doc typo: s/prior committing/prior to committing/
18254 Johannes Schindelin (1):
18255 gitk: make Ctrl "+" really increase the font size
18257 Junio C Hamano (8):
18258 builtin-commit.c: remove useless check added by faulty cut and paste
18259 Revert "builtin-commit.c: remove useless check added by faulty cut and paste"
18260 Fix git-rerere documentation
18261 Squelch bogus progress output from git-rebase--interactive
18262 Document lockfile API
18263 Officially deprecate repo-config.
18264 http-push: clarify the reason of error from the initial PROPFIND request
18267 Kristian Høgsberg (1):
18268 git-commit: fix double close(2) that can close a wrong file descriptor
18271 Move sha1_file_to_archive into libgit
18273 Linus Torvalds (4):
18274 Fix performance regression for partial commits
18275 Make builtin-commit.c more careful about parenthood
18276 Make 'git fsck' complain about non-commit branches
18277 Be more careful about updating refs
18280 hg-to-git: improve popen calls
18283 git-gui: Makefile - Handle $DESTDIR on Cygwin
18285 Martin Koegler (1):
18286 parse_commit_buffer: tighten checks while parsing
18289 Add using merge subtree How-To
18290 ls-remote: add -t and -h options.
18291 Include rev-list options in git-log manpage.
18293 Peter Karlsson (1):
18294 git-gui: Updated Swedish translation after mailing list review.
18296 Shawn O. Pearce (3):
18297 git-gui: Allow 'Create New Repository' on existing directories
18298 git-gui: Refresh file status description after hunk application
18299 Fix random fast-import errors when compiled with NO_MMAP
18302 core-tutorial typofix
18305 Version v1.5.4-rc3; changes since v1.5.4-rc2:
18306 ---------------------------------------------
18308 Alexandre Julliard (6):
18309 git.el: Support for getting diffs from inside the log-edit buffer.
18310 git.el: Retrieve the permissions for up-to-date files.
18311 git.el: Display file types and type changes.
18312 git.el: Make sure we never insert the same file twice.
18313 git.el: Refresh files from their real state upon commit.
18314 git.el: Make status refresh faster.
18317 git-gui: Make commit log messages end with a newline
18320 git-relink.txt: describe more clearly how hard linking occurs
18322 Charles Bailey (1):
18323 gitk: Fix the Makefile to cope with systems lacking msgfmt
18325 Christian Couder (1):
18326 Documentation: config: add 'help.*' and 'instaweb.*' variables.
18328 Christian Stimming (10):
18329 gitk i18n: Add Makefile with rules for po file creation and installation
18330 gitk i18n: Import msgcat for message string translation; load translation catalogs
18331 gitk i18n: Markup several strings for translation
18332 gitk i18n: Initial German translation
18333 gitk i18n: More markup -- various options menus
18334 gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright character is valid utf8.
18335 gitk: Update and fix Makefile
18336 gitk: Update German translation
18337 gitk: Fix typo in user message.
18338 gitk: Update German translation.
18341 Documentation: rename gitlink macro to linkgit
18344 git-svn: allow dcommit --no-rebase to commit multiple, dependent changes
18345 git-svn: unlink index files that were globbed, too
18346 git-svn: support for funky branch and project names over HTTP(S)
18347 git-svn: clarify the "Ignoring error from SVN" piece
18349 Florian La Roche (1):
18350 Change git-gc documentation to reflect gc.packrefs implementation.
18353 gitk: use user-configured background in view definition dialog
18355 Grégoire Barbier (1):
18356 Fix double-free() in http-push.c:remote_exists()
18358 Gustaf Hendeby (1):
18359 Documentation/user-manual.txt: fix typo
18361 J. Bruce Fields (1):
18362 Documentation: fix remote.<name>.skipDefaultUpdate description
18365 Make the git metapackage require the same version of the subpackages.
18368 config: handle lack of newline at end of file better
18369 git-reset: refuse to do hard reset in a bare repository
18370 add a "basic" diff config callback
18371 diff: load funcname patterns in "basic" config
18372 diff: remove lazy config loading
18373 add--interactive: remove unused diff colors
18374 add--interactive: allow diff colors without interactive colors
18375 Document the color.interactive semantics
18378 Fix grammar nits in documentation and in code comments.
18379 Don't access line[-1] for a zero-length "line" from fgets.
18380 bundle, fast-import: detect write failure
18382 Johannes Schindelin (2):
18383 Optimize prefixcmp()
18384 shortlog: mention the "-e" option in the usage
18387 git-gui: Move frequently used commands to the top of the context menu.
18388 recv_sideband: Do not use ANSI escape sequence on dumb terminals.
18390 Junio C Hamano (27):
18391 Documentation/git-submodule.txt: typofix
18392 "git pull --tags": error out with a better message.
18393 git-rebase -i behaves better on commits with incomplete messages
18394 git-rebase -i: clean-up error check codepath.
18395 lock_any_ref_for_update(): reject wildcard return from check_ref_format
18396 Update callers of check_ref_format()
18397 Uninline prefixcmp()
18398 git-clean: make "Would remove ..." path relative to cwd again
18399 t/t7600: avoid GNUism in grep
18400 t/t{3600,3800,5401}: do not use egrep when grep would do
18401 t/t3800: do not use a temporary file to hold expected result.
18402 Update draft release notes for 1.5.4
18403 git-stash clear: refuse to work with extra parameter for now
18404 git-rev-parse --symbolic-full-name
18405 filter-branch: work correctly with ambiguous refnames
18406 custom pretty format: tolerate empty e-mail address
18407 Documentation: remove gitman.info with "make clean"
18408 Documentation: fix "gitlink::foobar[s]"
18409 utf8: pick_one_utf8_char()
18410 utf8_width(): allow non NUL-terminated input
18411 diff: do not chomp hunk-header in the middle of a character
18412 Update draft release notes for 1.5.4
18414 "git-apply --check" should not report "fixed"
18415 pack-objects: remove redundant and wrong call to deflateEnd()
18416 RPM spec: include gitk message files.
18420 Trim leading / off of paths in git-svn prop_walk
18422 Marco Costalba (2):
18423 Document git-reset defaults to HEAD if no commit is given
18424 git-stash: use stdout instead of stderr for non error messages
18427 git-gui: Unconditionally use absolute paths with Cygwin
18428 Documentation/Makefile - honor $DESTDIR for quick-install target
18430 Martin Koegler (4):
18431 receive-pack: check object type of sha1 before using them as commits
18432 receive-pack: reject invalid refnames
18433 parse_tag_buffer: don't parse invalid tags
18434 tree-walk: don't parse incorrect entries
18436 Michael Stefaniuc (1):
18437 git-am: Run git gc only once and not for every patch.
18439 Michele Ballabio (1):
18440 Document some default values in config.txt
18443 git-sh-setup: document git_editor() and get_author_ident_from_commit()
18444 t/t7001: avoid unnecessary ERE when using grep
18447 slightly better auto gc message
18449 Paul Mackerras (2):
18450 gitk: Recode de.po to UTF-8
18451 gitk: Restore some widget options whose defaults changed in Tk 8.5
18453 Peter Karlsson (1):
18454 Added Swedish translation.
18456 Ralf Wildenhues (1):
18457 Documentation: typofix
18460 Allow git-mergetool to handle paths with a leading space
18462 Shawn O. Pearce (1):
18463 git-gui: Handle file mode changes (644->755) in diff viewer
18466 Version v1.5.4-rc2; changes since v1.5.4-rc1:
18467 ---------------------------------------------
18470 Allow selection of different cleanup modes for commit messages
18472 Arjen Laarhoven (1):
18473 Fix "git log --diff-filter" bug
18475 Charles Bailey (1):
18476 Remove old generated files from .gitignore.
18478 Gustaf Hendeby (2):
18479 Make git send-email accept $EDITOR with arguments
18480 shortlog manpage documentation: work around asciidoc markup issues
18482 Jakub Narebski (1):
18483 gitweb: fix whitespace in config_to_multi (indent with tab)
18486 clean up 1.5.4 release notes
18487 cvsimport: die on cvsps errors
18490 Don't dereference NULL upon lookup failure.
18492 Johannes Schindelin (2):
18493 Teach diff machinery to display other prefixes than "a/" and "b/"
18494 Mention git-shell's "cvs" substitution in the RelNotes
18496 Junio C Hamano (14):
18497 t4024: fix test script to use simpler sed pattern
18498 fix git commit --amend -m "new message"
18499 shell-scripts usage(): consistently exit with non-zero
18500 Documentation: ls-files -v is about "assume unchanged".
18501 Fix $EDITOR regression introduced by rewrite in C.
18502 t7005: do not exit inside test.
18503 builtin-commit: fix amending of the initial commit
18504 builtin-commit: avoid double-negation in the code.
18505 Documentation: describe 'union' low-level merge driver
18506 Fix documentation of --first-parent in git-log and copy it to git-rev-list
18507 combine-diff: Fix path quoting
18508 Fix rewrite_diff() name quoting.
18509 contrib: resurrect scripted git-revert.
18512 Linus Torvalds (1):
18513 Re(-re)*fix trim_common_tail()
18516 everyday: replace 'prune' and 'repack' with 'gc'
18518 Pierre Habouzit (3):
18519 git-tag: fix -l switch handling regression.
18520 Force the sticked form for options with optional arguments.
18521 parse-options: Add a gitcli(5) man page.
18524 Make "--pretty=format" parser a bit more careful.
18526 Shawn O. Pearce (2):
18527 Reallow git-rebase --interactive --continue if commit is unnecessary
18528 Improve error messages when int/long cannot be parsed from config
18530 Stefan Sperling (1):
18531 Small comment fix for git-cvsimport.
18533 Wincent Colaiuta (1):
18534 Emit helpful status for accidental "git stash" save
18537 Version v1.5.4-rc1; changes since v1.5.4-rc0:
18538 ---------------------------------------------
18540 Andy Whitcroft (1):
18541 git-svn: expand handling of From: and Signed-off-by:
18543 Charles Bailey (1):
18544 Fix git-instaweb breakage on MacOS X due to the limited sed functionality
18546 Christian Couder (1):
18547 git-help: add "help.format" config variable.
18549 David S. Miller (1):
18550 fast-import: fix unalinged allocation and access
18553 git-svn: unlink internal index files after operations
18554 git-svn: handle our top-level path being deleted and later re-added
18555 git-svn: avoid leaving leftover committer/author info in rebase
18556 git-svn: workaround a for broken symlinks in SVN
18557 git-svn: avoid warning when run without arguments
18559 Finn Arne Gangstad (1):
18560 Improved submodule merge support
18562 H.Merijn Brand (1):
18563 the use of 'tr' in the test suite isn't really portable
18565 J. Bruce Fields (8):
18566 whitespace: fix off-by-one error in non-space-in-indent checking
18567 whitespace: reorganize initial-indent check
18568 whitespace: minor cleanup
18569 whitespace: fix initial-indent checking
18570 whitespace: more accurate initial-indent highlighting
18571 whitespace: fix config.txt description of indent-with-non-tab
18572 builtin-apply: minor cleanup of whitespace detection
18573 builtin-apply: stronger indent-with-on-tab fixing
18575 Jakub Narebski (2):
18576 gitweb: disambiguate heads and tags withs the same name
18577 gitweb: Teach "a=blob" action to be more lenient about blob/file mime type
18580 cvsexportcommit: fix massive commits
18581 trim_common_tail: brown paper bag fix.
18582 teach bash completion to treat commands with "--" as a helper
18583 rename git-browse--help to git-help--browse
18584 clone: correctly report http_fetch errors
18585 git-send-email: avoid duplicate message-ids
18586 test "git clone -o"
18589 git-filter-branch.sh: more portable tr usage: use \012, not \n.
18591 Johannes Schindelin (4):
18592 Support config variable diff.external
18593 Document diff.external and mergetool.<tool>.path
18594 rebase -p -i: handle "no changes" gracefully
18595 git show <tag>: show the tagger
18598 threaded pack-objects: Use condition variables for thread communication.
18599 Plug a resource leak in threaded pack-objects code.
18600 Clean up documentation that references deprecated 'git peek-remote'.
18601 filter-branch: Remove broken and unnecessary summary of rewritten refs.
18603 Junio C Hamano (17):
18604 git-commit: squelch needless message during an empty merge
18605 xdl_diff: identify call sites.
18606 xdi_diff: trim common trailing lines
18607 diff --check: minor fixups
18608 xdiff tail trimming: use correct type.
18609 commit: allow --amend to reuse message from another commit
18610 remote: Fix bogus make_branch() call in configuration reader.
18611 Rename git-browse-help helper to git-browse--help
18612 Retire git-runstatus for real.
18613 Start preparing the API documents.
18614 Update draft release notes for 1.5.4
18615 Re-re-re-fix common tail optimization
18616 builtin-commit: fix summary output.
18617 builtin-commit: make summary output consistent with status
18618 Documentation/git-submodule: refer to gitmodules(5)
18619 builtin-blame.c: remove unneeded memclr()
18622 Kristian Høgsberg (1):
18623 Use a strbuf for building up section header and key/value pair strings.
18628 Linus Torvalds (1):
18629 unpack-trees: FLEX_ARRAY fix
18632 clone: fix options '-o' and '--origin' to be recognised again
18635 Fix some more memory leaks in http-push.c
18636 Fix random sha1 in error message in http-fetch and http-push
18637 Remove the default_headers variable from http-push.c
18638 Remove a CURLOPT_HTTPHEADER (un)setting
18639 Avoid redundant declaration of missing_target()
18640 Use strbuf in http code
18641 Fix various memory leaks in http-push.c and http-walker.c
18642 Move fetch_ref from http-push.c and http-walker.c to http.c
18645 provide advance warning of some future pack default changes
18646 fix style of a few comments in diff-delta.c
18647 make 'git describe --all --contains' work
18650 gitweb: Make config_to_multi return [] instead of [undef]
18652 Pierre Habouzit (1):
18653 Fix segfault in diff-delta.c when FLEX_ARRAY is 1
18655 Ralf Wildenhues (1):
18656 Fix some documentation typos.
18659 Clarify error response from 'git fetch' for bad responses
18661 Sean Estabrooks (1):
18662 Fix interactive rebase to preserve author email address
18665 Fix spelling mistakes in user manual
18667 Shawn O. Pearce (2):
18668 Avoid update hook during git-rebase --interactive
18669 Catch and handle git-commit failures in git-rebase --interactive
18671 Wincent Colaiuta (6):
18672 "diff --check" should affect exit status
18673 Unify whitespace checking
18674 Make "diff --check" output match "git apply"
18675 Add tests for "git diff --check" with core.whitespace options
18676 Use shorter error messages for whitespace problems
18677 Test interaction between diff --check and --exit-code
18680 Documentation: describe pack idx v2
18683 Version v1.5.4-rc0; changes since v1.5.3.8:
18684 -------------------------------------------
18687 fix t5403-post-checkout-hook.sh: built-in test in dash does not have "=="
18688 Fix a crash in ls-remote when refspec expands into nothing
18689 More updates and corrections to the russian translation of git-gui
18690 Rework make_usage to print the usage message immediately
18691 Updated russian translation of git-gui
18692 Do no colorify test output if stdout is not a terminal
18693 Add a test checking if send-pack updated local tracking branches correctly
18694 Update the tracking references only if they were succesfully updated on remote
18695 Fix dependencies of parse-options test program
18696 Do not generate full commit log message if it is not going to be used
18697 Simplify crud() in ident.c
18698 Fix git-fast-export for zero-sized blobs
18700 Alexandre Julliard (12):
18701 git.el: Keep the status buffer sorted by filename.
18702 git.el: Allow selecting whether to display uptodate/unknown/ignored files.
18703 git.el: Allow the add and remove commands to be applied to ignored files.
18704 git.el: Preserve file marks when doing a full refresh.
18705 git.el: Do not print a status message on every git command.
18706 git.el: Update a file status in the git buffer upon save.
18707 git.el: Reset the permission flags when changing a file state.
18708 git.el: Fix typo in "Reverted file" message.
18709 git.el: Fix typo in git-update-saved-file error handling.
18710 git.el: Refresh only the changed file marks when marking/unmarking all.
18711 git.el: Run git-gc --auto after commits.
18712 git.el: Added a menu for git-status-mode.
18714 Andreas Ericsson (1):
18715 Simplify strchrnul() compat code
18717 André Goddard Rosa (2):
18718 Print the real filename that we failed to open.
18719 Error out when user doesn't have access permission to the repository
18722 parse_date_format(): convert a format name to an enum date_mode
18723 Make for-each-ref allow atom names like "<name>:<something>"
18724 Make for-each-ref's grab_date() support per-atom formatting
18725 Add a test script for for-each-ref, including test of date formatting
18727 Andy Whitcroft (6):
18728 Teach send-pack a mirror mode
18729 git-push: plumb in --mirror mode
18730 Add tests for git push'es mirror mode
18731 git-push: add documentation for the newly added --mirror mode
18732 git-quiltimport.sh fix --patches handling
18733 git-svn: add support for pulling author from From: and Signed-off-by:
18735 Anton Gyllenberg (1):
18736 gitview: import only one of gtksourceview and gtksourceview2
18738 Ask Bjørn Hansen (1):
18739 send-email: Don't add To: recipients to the Cc: header
18741 Benoit Sigoure (7):
18742 git-svn: add a generic tree traversal to fetch SVN properties
18743 git-svn: implement git svn create-ignore
18744 git-svn: add git svn propget
18745 git-svn: add git svn proplist
18746 git-svn: simplify the handling of fatal errors
18747 core-tutorial: Catch up with current Git
18748 git-svn: sort the options in the --help message.
18750 Björn Steinbrink (1):
18751 git config: Don't rely on regexec() returning 1 on non-match
18753 Blake Ramsdell (1):
18754 transport.c: squelch a gcc 4.0.1 complaint about an uninitialized variable
18757 git-gc: by default use safer "-A" option to repack when not --prune'ing
18758 git-gc --auto: simplify "repack" command line building
18761 Add a --dry-run option to git-send-pack.
18762 Add a --dry-run option to git-push.
18764 Brian Gernhardt (3):
18765 format-patch: Add configuration and off switch for --numbered
18766 format-patch: Test --[no-]numbered and format.numbered
18767 t3502: Disambiguate between file and rev by adding --
18769 Brian M. Carlson (1):
18770 git-gui: Reorder msgfmt command-line arguments
18773 Function for updating refs.
18774 Add tests for documented features of "git reset".
18775 Move make_cache_entry() from merge-recursive.c into read-cache.c
18776 Make "git reset" a builtin.
18777 Make builtin-tag.c use parse_options.
18779 Charles Bailey (1):
18780 Fix clone not to ignore depth when performing a local clone
18783 git-p4 support for perforce renames.
18784 git-p4: Add a helper function to parse the full git diff-tree output.
18785 git-p4: Detect changes to executable bit and include them in p4 submit.
18787 Christian Couder (27):
18788 rev-list --bisect: Move finding bisection into do_find_bisection.
18789 rev-list --bisect: Move some bisection code into best_bisection.
18790 rev-list --bisect: Bisection "distance" clean up.
18791 rev-list --bisect: Fix best == NULL case.
18792 Test suite: reset TERM to its previous value after testing.
18793 rev-list: implement --bisect-all
18794 rev-list documentation: add "--bisect-all".
18795 Bisect: fix some white spaces and empty lines breakages.
18796 Bisect: implement "bisect skip" to mark untestable revisions.
18797 Bisect: refactor "bisect_write_*" functions.
18798 Bisect: refactor some logging into "bisect_write".
18799 Bisect: refactor "bisect_{bad,good,skip}" into "bisect_state".
18800 Bisect: add "bisect skip" to the documentation.
18801 Bisect: add a "bisect replay" test case.
18802 Bisect run: "skip" current commit if script exit code is 125.
18803 Bisect: add "skip" to the short usage string.
18804 Bisect reset: remove bisect refs that may have been packed.
18805 Bisect visualize: use "for-each-ref" to list all good refs.
18806 Bisect: use "$GIT_DIR/BISECT_NAMES" to check if we are bisecting.
18807 Bisect reset: do nothing when not bisecting.
18808 Documentation: add a new man page for "git-help"
18809 Trace and quote with argv: get rid of unneeded count argument.
18810 git-help: add -i|--info option to display info page.
18811 Documentation: describe -i/--info option to "git-help"
18812 git-help: add -w|--web option to display html man page in a browser.
18813 Use {web,instaweb,help}.browser config options.
18814 Documentation: describe -w/--web option to "git-help".
18816 Christian Stimming (14):
18817 Mark strings for translation.
18818 Makefile rules for translation catalog generation and installation.
18819 Add glossary that can be converted into a po file for each language.
18820 Add glossary translation template into git.
18821 German translation for git-gui
18822 German glossary for translation
18823 git-gui: Add more words to translation glossary
18824 git-gui: Update German glossary according to mailing list discussion
18825 git-gui: Incorporate glossary changes into existing German translation
18826 git-gui: Update German translation, including latest glossary changes
18827 git-gui: Add more terms to glossary.
18828 git-gui: Update German translation
18829 Update git-gui.pot with latest (few) string additions and changes.
18830 Update German translation. 100% completed.
18833 Remove outdated references to cogito in documentation
18835 Daniel Barkalow (23):
18836 Refactor http.h USE_CURL_MULTI fill_active_slots().
18837 Make function to refill http queue a callback
18838 Remove obsolete commit-walkers
18839 Modularize commit-walker
18840 Add uploadpack configuration info to remote.
18841 Report information on branches from remote.h
18842 Make fetch-pack a builtin with an internal API
18843 Push code for transport library
18844 Add matching and parsing for fetch-side refspec rules
18845 Add fetch methods to transport library.
18846 Make fetch a builtin
18847 Allow abbreviations in the first refspec to be merged
18848 Fix adding a submodule with a remote url
18849 Restore default verbosity for http fetches.
18850 Remove duplicate ref matches in fetch
18851 Correct handling of upload-pack in builtin-fetch-pack
18852 Miscellaneous const changes and utilities
18853 Build-in peek-remote, using transport infrastructure.
18854 Use built-in send-pack.
18855 Build-in send-pack, with an API for other programs to call.
18857 Use parseopts in builtin-push
18858 Add more checkout tests
18860 David D. Kilzer (8):
18861 git-svn log: fix ascending revision ranges
18862 git-svn log: include commit log for the smallest revision in a range
18863 git-svn log: handle unreachable revisions like "svn log"
18864 git-send-email: show all headers when sending mail
18865 git-svn: extract reusable code into utility functions
18866 git-svn info: implement info command
18867 git-svn: info --url [path]
18868 git-svn: Remove unnecessary Git::SVN::Util package
18871 diff-delta.c: pack the index structure
18872 diff-delta.c: Rationalize culling of hash buckets
18873 git-commit.sh: Shell script cleanup
18876 git-svn: Fix a typo and add a comma in an error message in git-svn
18879 gitweb: Provide title attributes for abbreviated author names.
18880 gitweb: Refactor abbreviation-with-title-attribute code.
18881 gitweb: Use chop_and_escape_str in more places.
18882 Rearrange git-format-patch synopsis to improve clarity.
18883 git-checkout: Support relative paths containing "..".
18884 git-checkout: Test for relative path use.
18885 Mention that git-rm can be an appropriate resolution as well as git-add.
18888 gitweb: the commitdiff is very commonly used, it's needed on search page, too
18890 Dmitry Potapov (1):
18891 preserve executable bits in zip archives
18893 Douglas Stockwell (1):
18894 send-email: Add support for SSL and SMTP-AUTH
18897 Fixed a command line option type for builtin-fsck.c
18898 git-stash: Fix listing stashes
18901 git-svn: support for funky branch and project names over HTTP(S)
18902 git-svn: add tests for command-line usage of init and clone commands
18903 t9106: fix a race condition that caused svn to miss modifications
18904 git-svn: allow `info' command to work offline
18905 git-svn: replace .rev_db with a more space-efficient .rev_map format
18906 git-svn: reinstate old rev_db optimization in new rev_map
18908 Eygene Ryabinkin (2):
18909 git-svn: respect Subversion's [auth] section configuration values
18910 git-svn: use "no warnings 'once'" to disable false-positives
18912 Eyvind Bernhardsen (1):
18913 Fix mis-markup of the -p, --patch option in git-add(1)
18915 Frederick Akalin (1):
18916 gtksourceview2 support for gitview
18919 No longer install git-svnimport, move to contrib/examples
18920 git-reset: add -q option to operate quietly
18921 contrib/hooks/post-receive-email: fix typo
18922 contrib/hooks/post-receive-email: reformat to wrap comments at 76 chars
18923 contrib/hooks/post-receive-email: make subject prefix configurable
18924 hooks--update: fix test for properly set up project description file
18925 hooks--update: decline deleting tags or branches by default, add config options
18926 contrib/hooks/post-receive-email: remove cruft, $committer is not used
18927 Don't cache DESTDIR in perl/perl.mak.
18930 git-cvsimport: fix handling of user name when it is not set in CVSROOT
18933 Remove unreachable statements
18934 Use compat mkdtemp() on Solaris boxes
18936 Gustaf Hendeby (1):
18937 git-svn now reads settings even if called in subdirectory
18939 H.Merijn Brand (1):
18940 Do not rely on the exit status of "unset" for unset variables
18942 Harri Ilari Tapio Liusvaara (1):
18943 git-gui: Disambiguate "commit"
18946 git-clone: honor "--" to end argument parsing
18949 git-gui: initial version of russian translation
18951 J. Bruce Fields (3):
18952 git-rebase: support --whitespace=<option>
18953 git-rebase: fix -C option
18954 errors: "strict subset" -> "ancestor"
18956 Jakub Narebski (18):
18957 gitweb: Fix and simplify "split patch" detection
18958 gitweb: Always set 'from_file' and 'to_file' in parse_difftree_raw_line
18959 gitweb: Add 'status_str' to parse_difftree_raw_line output
18960 gitweb: Remove CGI::Carp::set_programname() call from t9500 gitweb test
18961 gitweb: Easier adding/changing parameters to current URL
18962 gitweb: Use href(-replay=>1, page=>...) to generate pagination links
18963 gitweb: Use href(-replay=>1, action=>...) to generate alternate views
18964 gitweb: Add tests for overriding gitweb config with repo config
18965 gitweb: Read repo config using 'git config -z -l'
18966 gitweb: Use config file for repository description and URLs
18967 gitweb: Style all tables using CSS
18968 gitweb: Put project README in div.readme, fix its padding
18969 autoconf: Add tests for memmem, strtoumax and mkdtemp functions
18970 Add config_int() method to the Git perl module
18971 gitweb: Update and improve gitweb/README file
18972 contrib: Make remotes2config.sh script more robust
18973 autoconf: Add test for OLD_ICONV (squelching compiler warning)
18974 autoconf: Check asciidoc version to automatically set ASCIIDOC8
18977 remote: add 'rm' subcommand
18978 remote: document the 'rm' subcommand
18979 gc: use parse_options
18982 git-remote: exit with non-zero status after detecting error in "rm".
18983 On error, do not list all commands, but point to --help option
18986 contrib/fast-import: add perl version of simple example
18987 diffcore-rename: cache file deltas
18988 git-rebase: document suppression of duplicate commits
18989 send-pack: don't update tracking refs on error
18990 t5516: test update of local refs on push
18991 git-gc: improve wording of --auto notification
18992 Documentation/git-gc: explain --auto in description
18993 Documentation/git-gc: improve description of --auto
18994 more terse push output
18995 receive-pack: don't mention successful updates
18996 send-pack: require --verbose to show update of tracking refs
18997 git-ls-files: add --exclude-standard
18998 send-pack: track errors for each ref
18999 send-pack: check ref->status before updating tracking refs
19000 send-pack: assign remote errors to each ref
19001 make "find_ref_by_name" a public function
19002 send-pack: tighten remote error reporting
19003 send-pack: fix "everything up-to-date" message
19004 avoid "defined but not used" warning for fetch_objs_via_walker
19005 send-pack: cluster ref status reporting
19006 git-tag: test that -s implies an annotated tag
19007 Revert "t5516: test update of local refs on push"
19008 git-commit: clean up die messages
19009 Enable rewrite as well as rename detection in git-status
19010 quote_path: fix collapsing of relative paths
19011 t9600: require cvsps 2.1 to perform tests
19012 t7300: add test for clean with wildcard pathspec
19013 wt-status.c:quote_path(): convert empty path to "./"
19014 add status.relativePaths config variable
19015 git-status: documentation improvements
19016 don't mention index refreshing side effect in git-status docs
19017 Add git-browse-help to .gitignore
19018 Support GIT_PAGER_IN_USE environment variable
19019 git-svn: get color config from --get-colorbool
19020 shortlog: document -e option
19021 git-clone: print an error message when trying to clone empty repo
19023 Jeff Muizelaar (1):
19024 fix contrib/hooks/post-receive-email hooks.recipients error message
19027 hooks-pre-commit: use \t, rather than a literal TAB in regexp
19029 Johannes Schindelin (57):
19032 Teach "git remote" a mirror mode
19033 verify-tag: also grok CR/LFs in the tag signature
19034 apply: get rid of --index-info in favor of --build-fake-ancestor
19035 Move bundle specific stuff into bundle.[ch]
19036 Add bundle transport
19037 git-gui: Deiconify startup wizard so it raises to the top
19038 git-gui: add a simple msgfmt replacement
19039 rebase -i: commit when continuing after "edit"
19040 rebase -i: style fixes and minor cleanups
19041 rebase -i: Fix numbers in progress report
19042 rebase -i: avoid exporting GIT_AUTHOR_* variables
19043 rebase -i: work on a detached HEAD
19044 rebase -i: support single-letter abbreviations for the actions
19045 Introduce remove_dir_recursively()
19046 fetch/push: readd rsync support
19047 Support cvs via git-shell
19048 Fix compilation when NO_CURL is defined
19049 cvsexportcommit: get rid of temporary directory
19050 fetch: if not fetching from default remote, ignore default merge
19051 Deduce exec_path also from calls to git with a relative path
19052 Add tests for parse-options.c
19053 parse-options: Allow abbreviated options when unambiguous
19054 po2msg: ignore entries marked with "fuzzy"
19055 po2msg: ignore untranslated messages
19056 po2msg: actually output statistics
19057 git-reset: do not be confused if there is nothing to reset
19058 Split off the pretty print stuff into its own file
19059 parse-options: abbreviation engine fix.
19060 builtin-reset: do not call "ls-files --unmerged"
19061 builtin-reset: avoid forking "update-index --refresh"
19062 Deprecate git-lost-found
19063 rebase: operate on a detached HEAD
19064 builtin-blame: set up the work_tree before the first file access
19065 rebase: fix "rebase --continue" breakage
19066 Close files opened by lock_file() before unlinking.
19067 rebase -i: move help to end of todo file
19068 launch_editor(): read the file, even when EDITOR=:
19069 builtin-commit: fix reflog message generation
19070 git status: show relative paths when run in a subdirectory
19071 builtin-commit: fix --signoff
19072 builtin-commit --s: add a newline if the last line was not a S-o-b
19073 builtin-commit: resurrect behavior for multiple -m options
19074 builtin-commit: Add newline when showing which commit was created
19075 Replace "runstatus" with "status" in the tests
19076 filter-branch: fix dirty way to provide the helpers to commit filters
19077 git checkout's reflog: even when detaching the HEAD, say from where
19078 bash completion: add diff options
19079 Replace instances of export VAR=VAL with VAR=VAL; export VAR
19080 Teach 'git pull' about --rebase
19081 rebase -i: give rerere a chance
19082 receive-pack: allow deletion of corrupt refs
19083 Add "--expire <time>" option to 'git prune'
19084 Add 'git fast-export', the sister of 'git fast-import'
19085 fast-export: rename the signed tag mode 'ignore' to 'verbatim'
19086 Allow ':/<oneline-prefix>' syntax to work with save_commit_buffer == 0
19088 Johannes Sixt (38):
19089 git-gui: Change main window layout to support wider screens
19090 gitk: Do not pick up file names of "copy from" lines
19091 Change git_connect() to return a struct child_process instead of a pid_t.
19092 Use start_command() in git_connect() instead of explicit fork/exec.
19093 Use start_command() to run content filters instead of explicit fork/exec.
19094 Use run_command() to spawn external diff programs instead of fork/exec.
19095 Use start_comand() in builtin-fetch-pack.c instead of explicit fork/exec.
19096 Have start_command() create a pipe to read the stderr of the child.
19097 upload-pack: Use start_command() to run pack-objects in create_pack_file().
19098 Add infrastructure to run a function asynchronously.
19099 Use the asyncronous function infrastructure in builtin-fetch-pack.c.
19100 upload-pack: Move the revision walker into a separate function.
19101 upload-pack: Run rev-list in an asynchronous function.
19102 t0021-conversion.sh: Test that the clean filter really cleans content.
19103 Avoid a dup2(2) in apply_filter() - start_command() can do it for us.
19104 Use the asyncronous function infrastructure to run the content filter.
19105 Fix an infinite loop in sq_quote_buf().
19106 upload-pack: Use finish_{command,async}() instead of waitpid().
19107 Give git-am back the ability to add Signed-off-by lines.
19108 git-clean: Fix error message if clean.requireForce is not set.
19109 Fix preprocessor logic that determines the availablity of strchrnul().
19110 t5300-pack-object.sh: Split the big verify-pack test into smaller parts.
19111 t7501-commit.sh: Not all seds understand option -i
19112 t5302-pack-index: Skip tests of 64-bit offsets if necessary.
19113 Skip t3902-quoted.sh if the file system does not support funny names.
19114 Use is_absolute_path() in sha1_file.c.
19115 Move #include <sys/select.h> and <sys/ioctl.h> to git-compat-util.h.
19116 builtin run_command: do not exit with -1.
19117 Allow a relative builtin template directory.
19118 Introduce git_etc_gitconfig() that encapsulates access of ETC_GITCONFIG.
19119 Allow ETC_GITCONFIG to be a relative path.
19120 refs.c: Remove unused get_ref_sha1()
19121 fetch-pack: Prepare for a side-band demultiplexer in a thread.
19122 Flush progress message buffer in display().
19123 git-gui: Improve the application icon on Windows.
19124 git-commit: Allow to amend a merge commit that does not change the tree
19125 for-each-ref: Fix quoting style constants.
19126 Fix a typo in checkout.sh and cleanup one-line help messages
19129 Update manpages to reflect new short and long option aliases
19130 Documentation: Fix references to deprecated commands
19132 Jonathan del Strother (2):
19133 Fixing path quoting in git-rebase
19134 gitk: Add support for OS X mouse wheel
19137 Add post-merge hook, related documentation, and tests.
19138 Added example hook script to save/restore permissions/ownership.
19139 post-checkout hook, tests, and docs
19140 Minor usage update in setgitperms.perl
19142 Junio C Hamano (157):
19143 Keep last used delta base in the delta window
19144 git-gui po/README: Guide to translators
19146 Implement git gc --auto
19147 Invoke "git gc --auto" from commit, merge, am and rebase.
19148 archive - leakfix for format_subst()
19149 git-commit: Allow partial commit of file removal.
19150 An additional test for "git-reset -- path"
19152 git-commit: partial commit of paths only removed from the index
19153 Document ls-files --with-tree=<tree-ish>
19154 builtin-pack-objects.c: avoid bogus gcc warnings
19155 stash: implement "stash create"
19156 rebase: allow starting from a dirty tree.
19157 Export matches_pack_name() and fix its return value
19158 pack-objects --keep-unreachable
19159 repack -A -d: use --keep-unreachable when repacking
19160 git-gc --auto: move threshold check to need_to_gc() function.
19161 git-gc --auto: add documentation.
19162 git-gc --auto: protect ourselves from accumulated cruft
19163 git-gc --auto: restructure the way "repack" command line is built.
19164 git-gc --auto: run "repack -A -d -l" as necessary.
19165 builtin-apply.c: fix a tiny leak introduced during xmemdupz() conversion.
19166 builtin-for-each-ref.c::copy_name() - do not overstep the buffer.
19167 git-remote rm: add tests and minor fix-ups
19168 Start RelNotes for 1.5.4
19169 strbuf_setlen(): do not barf on setting length of an empty buffer to 0
19170 send-email --smtp-server-port: allow overriding the default port
19171 rerere: Fix use of an empty strbuf.buf
19172 git-am: make the output quieter.
19173 bundle transport: fix an alloc_ref() call
19174 Update stale documentation link in the k.org site
19175 git-am: fix typo in the previous one.
19176 dateformat: parse %(xxdate) %(yydate:format) correctly
19177 builtin-apply: fix conversion error in strbuf series
19178 Update state documentation link for 1.5.3.4
19179 k.org git toppage: Add link to 1.5.3 release notes.
19180 help: remove extra blank line after "See 'git --help'" message
19181 revert/cherry-pick: work on merge commits as well
19182 git-fetch: do not fail when remote branch disappears
19183 RelNotes-1.5.4: describe recent updates
19184 git-gui: Update Japanese strings (part 2)
19185 Revert "rebase: allow starting from a dirty tree."
19186 git-merge: no reason to use cpio anymore
19187 format-patch -s: add MIME encoding header if signer's name requires so
19188 cherry-pick/revert -m: add tests
19189 test format-patch -s: make sure MIME content type is shown as needed
19190 War on whitespace: first, a bit of retreat.
19191 git-diff: complain about >=8 consecutive spaces in initial indent
19192 core.whitespace: add test for diff whitespace error highlighting
19193 clean: require -f to do damage by default
19194 gc: --prune prunes unreferenced objects.
19195 scripts: Add placeholders for OPTIONS_SPEC
19196 git-rev-parse --parseopt
19197 git-sh-setup: fix parseopt `eval` string underquoting
19198 send-pack: segfault fix on forced push
19199 Style: place opening brace of a function definition at column 1
19200 git-am: -i does not take a string parameter.
19201 Update draft release notes for 1.5.4
19202 Documentation: lost-found is now deprecated.
19203 Make check-docs target detect removed commands
19204 Documentation: remove documentation for removed tools.
19205 git-commit: a bit more tests
19206 Resurrect git-revert.sh example and add comment to builtin-revert.c
19207 core.excludesfile clean-up
19208 Fix per-directory exclude handing for "git add"
19209 git-bisect: war on "sed"
19210 git-bisect: use update-ref to mark good/bad commits
19211 git-bisect: modernize branch shuffling hack
19212 Update draft release notes for 1.5.4
19213 Draft release notes: fix clean.requireForce description
19214 Update draft release notes for 1.5.4
19215 Move gitk to its own subdirectory
19216 git-clean: Fix error message if clean.requireForce is not set.
19217 git-compat-util.h: auto-adjust to compiler support of FLEX_ARRAY a bit better
19218 Fix "quote" misconversion for rewrite diff output.
19219 Make test scripts executable.
19220 file_exists(): dangling symlinks do exist
19221 builtin-commit: do not color status output shown in the message template
19222 builtin-commit: run commit-msg hook with correct message file
19223 Export three helper functions from ls-files
19224 Fix add_files_to_cache() to take pathspec, not user specified list of files
19225 builtin-commit: fix partial-commit support
19226 Addendum to "MaintNotes"
19227 git-add -i: allow multiple selection in patch subcommand
19228 git-branch --contains=commit
19229 git-branch --contains: doc and test
19230 builtin-tag: accept and process multiple -m just like git-commit
19231 Add a few more tests for git-commit
19232 builtin-apply: rename "whitespace" variables and fix styles
19233 t4119: correct overeager war-on-whitespace
19234 builtin-apply: teach whitespace_rules
19235 core.whitespace: documentation updates.
19236 Deprecate peek-remote
19237 Update draft release notes for 1.5.4
19238 builtin-add: fix command line building to call interactive
19239 add -i: Fix running from a subdirectory
19240 "git-tag -s" should create a signed annotated tag
19241 revert/cherry-pick: do not mention the original ref
19242 "color.diff = true" is not "always" anymore.
19243 git-config --get-color: get configured color
19244 dir.c: minor clean-up
19245 per-directory-exclude: lazily read .gitignore files
19246 Update draft release notes for 1.5.4
19247 Resurrect peek-remote
19248 Consolidate command list to one.
19249 Update draft release notes for 1.5.4
19250 rename: Break filepairs with different types.
19251 git-am: catch missing author date early.
19252 Fix --signoff in builtin-commit differently.
19253 git-commit: Allow to amend a merge commit that does not change the tree
19254 git-commit --allow-empty
19255 git-commit --allow-empty
19256 git-commit documentation: fix unfinished sentence.
19257 Add git-fast-export to list of commands.
19258 Update draft release notes for 1.5.4
19259 Run the specified perl in Documentation/
19260 Formatting fix for Documentation/git-help.txt
19261 Documentation: rerere is enabled by default these days.
19262 Documentation/git.txt: typofix
19263 t5510: add a bit more tests for fetch
19264 git-cvsserver runs hooks/post-update
19265 Revert "git-am: catch missing author date early."
19266 Documentation: color.* = true means "auto"
19267 git config --get-colorbool
19268 Color support for "git-add -i"
19269 git-clean: Honor pathspec.
19270 config --get-colorbool: diff.color is a deprecated synonym to color.diff
19271 Use gitattributes to define per-path whitespace rule
19272 hg-to-git: handle an empty dir in hg.
19273 do not discard status in fetch_refs_via_pack()
19274 git-status documentation: mention subdirectory behaviour
19275 Update draft release notes to 1.5.4
19276 git-bisect visualize: work in non-windowed environments better
19277 mailmap: fix bogus for() loop that happened to be safe by accident
19278 shortlog: code restructuring and clean-up
19279 git-shortlog -e: show e-mail address as well
19280 ls-remote: resurrect pattern limit support
19281 Fix commit-msg hook to allow editing
19282 Re-fix "builtin-commit: fix --signoff"
19284 Update draft Release Notes for 1.5.4
19285 Documentation: add gitman.info target
19286 git-help -i: invoke info with document and node name
19287 git-help -i: show info documentation from matching version of git
19288 send-email: do not muck with initial-reply-to when unset.
19289 commit: do not add extra LF at the end of the summary.
19290 Support a merge with conflicting gitlink change
19291 blame: drop blob data after passing blame to the parent
19292 shortlog: default to HEAD when the standard input is a tty
19293 git-diff --numstat -z: make it machine readable
19294 disable t9119 for now.
19295 Documentation: rename git.texi to user-manual.texi
19296 git.spec.in: remove python_path
19297 git-help -w: do not require to be in git repository
19298 RPM spec: Adjust htmldir
19302 git-stash: Display help message if git-stash is run with wrong sub-commands
19305 Updated Russian translation.
19307 Konstantin V. Arkhipov (1):
19308 git-svn's dcommit must use subversion's config
19310 Kristian Høgsberg (18):
19311 Enable wt-status output to a given FILE pointer.
19312 Enable wt-status to run against non-standard index file.
19313 Add strbuf_read_file().
19314 Clean up stripspace a bit, use strbuf even more.
19315 Introduce entry point add_interactive and add_files_to_cache
19316 Export rerere() and launch_editor().
19317 Port builtin-add.c to use the new option parser.
19318 Add testcase for amending and fixing author in git commit.
19319 Export launch_editor() and make it accept ':' as a no-op editor.
19320 Port git commit to C.
19321 builtin-commit: Refresh cache after adding files.
19322 Call refresh_cache() when updating the user index for --only commits.
19323 builtin-commit: Clean up an unused variable and a debug fprintf().
19324 t7501-commit: Add test for git commit <file> with dirty index.
19325 builtin-commit: Include the diff in the commit message when verbose.
19326 Fix off-by-one error when truncating the diff out of the commit message.
19327 Use a strbuf for copying the command line for the reflog.
19328 Rewrite builtin-fetch option parsing to use parse_options().
19330 Kristof Provost (1):
19331 makefile: Add a cscope target
19334 git-svn: add support for --first-parent
19335 git-svn: always use --first-parent
19336 Add test-script for git-merge porcelain
19337 git-merge: fix faulty SQUASH_MSG
19338 git-merge: refactor option parsing
19339 git-merge: add support for branch.<name>.mergeoptions
19340 git-merge: add support for --commit and --no-squash
19341 git-merge: add --ff and --no-ff options
19342 Make merge-recursive honor diff.renamelimit
19343 Teach git-pull about --[no-]ff, --no-squash and --commit
19344 for-each-ref: fix setup of option-parsing for --sort
19347 Speedup scanning for excluded files.
19349 Linus Torvalds (18):
19350 optimize diffcore-delta by sorting hash entries.
19351 Add 'diffcore.h' to LIB_H
19352 Split out "exact content match" phase of rename detection
19353 Ref-count the filespecs used by diffcore
19354 copy vs rename detection: avoid unnecessary O(n*m) loops
19355 Do linear-time/space rename logic for exact renames
19356 Do exact rename detection regardless of rename limits
19357 Fix ugly magic special case in exact rename detection
19358 Do the fuzzy rename detection limits with the exact renames removed
19359 Simplify topo-sort logic
19360 Add "--early-output" log flag for interactive GUI use
19361 Enhance --early-output format
19362 revision walker: mini clean-up
19363 Fix rev-list when showing objects involving submodules
19364 Fix parent rewriting in --early-output
19365 Fix a pathological case in git detecting proper renames
19366 Fix a pathological case in git detecting proper renames
19367 "git tag -u keyname" broken
19370 gitweb: speed up project listing on large work trees by limiting find depth
19372 Marius Storm-Olsen (2):
19373 Add 'git-p4 commit' as an alias for 'git-p4 submit'
19374 Teach core.autocrlf to 'git blame'
19377 git-submodule - allow a relative path as the subproject url
19380 Move convert-objects to contrib.
19381 rebase -i: create .dotest-merge after validating options.
19383 Matthias Kestenholz (1):
19384 Documentation: add --patch option to synopsis of git-add
19386 Michael Gebetsroither (1):
19387 hg-to-git speedup through selectable repack intervals
19389 Michael W. Olson (2):
19390 git-rebase--interactive.sh: Quote arguments to test
19391 Documentation/git-tag.txt: Document how to backdate tags
19393 Michael Witten (2):
19394 git-cvsexportcommit.perl: git-apply no longer needs --binary
19395 git-cvsserver runs hooks/post-receive
19397 Michal Vitecek (1):
19398 Don't use "<unknown>" for placeholders and suppress printing of empty user formats.
19400 Michele Ballabio (7):
19401 git-gui: remove dots in some UI strings
19402 git-gui: add some strings to translation
19403 git-gui: fix typo in lib/blame.tcl
19404 git-gui: update Italian translation
19405 test-lib.sh: move error line after error() declaration
19406 git-gui: fix a typo in lib/commit.tcl
19407 git-gui: update it.po and glossary/it.po
19410 instaweb: allow for use of auto-generated scripts
19411 instaweb: support for Ruby's WEBrick server
19414 Reuse previous annotation when overwriting a tag
19415 Add tests for git tag
19416 Refactor working tree setup
19417 Use setup_work_tree() in builtin-ls-files.c
19418 Don't always require working tree for git-rm
19419 Make git-blame fail when working tree is needed and we're not in one
19420 Small code readability improvement in show_reference() in builtin-tag.c
19421 Do git reset --hard HEAD when using git rebase --skip
19422 Fix and improve t7004 (git-tag tests)
19423 git-send-email.perl: Really add angle brackets to In-Reply-To if necessary
19424 Cleanup variables in http.[ch]
19425 Fix small memory leaks induced by diff_tree_setup_paths
19426 Fix XML parser leaks in http-push
19429 Hungarian translation of git-gui
19430 git-send-email: add a new sendemail.to configuration variable
19431 Include diff options in the git-log manpage
19432 Update Hungarian translation. 100% completed.
19434 Nanako Shiraishi (3):
19435 Japanese translation of git-gui
19436 git-gui: Update Japanese strings
19437 Update ja.po for git-gui
19439 Nguyễn Thái Ngọc Duy (3):
19440 contrib/fast-import: add simple shell example
19441 git-sh-setup.sh: use "git rev-parse --show-cdup" to check for SUBDIRECTORY_OK
19442 Remove repo version check from setup_git_directory
19444 Nicolas Pitre (42):
19445 straighten the list of objects to deltify
19446 localize window memory usage accounting
19447 rearrange delta search progress reporting
19448 basic threaded delta search
19449 threaded delta search: refine work allocation
19450 threaded delta search: better chunck split point
19451 threaded delta search: specify number of threads at run time
19452 fix threaded delta search locking
19453 threaded delta search: add pack.threads config variable
19454 threaded delta search: proper locking for cache accounting
19455 more compact progress display
19456 cope with multiple line breaks within sideband progress messages
19457 pack-objects: no delta possible with only one object in the list
19458 pack-objects.c: fix some global variable abuse and memory leaks
19459 fix const issues with some functions
19460 fix for more minor memory leaks
19461 prune-packed: don't call display_progress() for every file
19462 make struct progress an opaque type
19463 relax usage of the progress API
19464 add throughput to progress display
19465 add throughput display to index-pack
19466 add some copyright notice to the progress display code
19467 add throughput display to git-push
19468 return the prune-packed progress display to the inner loop
19469 make sure throughput display gets updated even if progress doesn't move
19470 Show total transferred as part of throughput progress
19471 make the pack index version configurable
19472 pack-objects: get rid of an ugly cast
19473 git-fetch: more terse fetch output
19474 fix display overlap between remote and local progress
19475 sideband.c: ESC is spelled '\033' not '\e' for portability.
19476 make display of total transferred more accurate
19477 remove dead code from the csum-file interface
19478 restore fetching with thin-pack capability
19479 make display of total transferred fully accurate
19480 nicer display of thin pack completion
19481 add a howto document about corrupted blob recovery
19482 rehabilitate some t5302 tests on 32-bit off_t machines
19483 pack-objects: fix delta cache size accounting
19484 pack-objects: reverse the delta search sort list
19485 pack-objects: fix threaded load balancing
19486 pack-objects: more threaded load balancing fix with often changed paths
19488 Paolo Ciarrocchi (1):
19489 Italian translation of git-gui
19492 git-stash: do not get fooled with "color.diff = true"
19493 Set OLD_ICONV on Cygwin.
19495 Paul Mackerras (37):
19496 gitk: Establish and use global left-to-right ordering for commits
19497 gitk: Improve the drawing of links to parent lines
19498 gitk: Eliminate diagonal arrows
19499 gitk: Get rid of idrowranges and rowrangelist
19500 gitk: Get rid of idinlist array
19501 gitk: Fix some problems with the display of ids as links
19502 gitk: Get rid of the rowchk array
19503 gitk: Do only the parts of the layout that are needed
19504 gitk: Fix bug causing incorrect ref list contents when switching view
19505 gitk: Fix bug causing undefined variable error when cherry-picking
19506 gitk: Add a cache for the topology info
19507 gitk: Make it possible to lay out all the rows we have received so far
19508 gitk: Fix bugs in setting rowfinal
19509 gitk: Get rid of lookingforhead, use commitinterest instead
19510 gitk: Fix bug in generating patches
19511 gitk: Simplify highlighting interface and combine with Find function
19512 gitk: Fix a couple of bugs
19513 gitk: Add progress bars for reading in stuff and for finding
19514 gitk: Fix the tab setting in the diff display window
19515 gitk: Fix bug causing Tcl error when changing find match type
19516 gitk: Use named fonts instead of the font specification
19517 gitk: Keep track of font attributes ourselves instead of using font actual
19518 gitk: Add a font chooser
19519 gitk: Fix bug where the last few commits would sometimes not be visible
19520 gitk: Get rid of the diffopts variable
19521 gitk: Fix Tcl error: can't unset findcurline
19522 gitk: Check that we are running on at least Tcl/Tk 8.4
19523 gitk: Avoid an error when cherry-picking if HEAD has moved on
19524 gitk: Fix "can't unset prevlines(...)" Tcl error
19525 gitk: Limit diff display to listed paths by default
19526 gitk: Ensure tabstop setting gets restored by Cancel button
19527 gitk: Integrate the reset progress bar in the main frame
19528 gitk: Use the status window for other functions
19529 gitk: Fix some bugs with path limiting in the diff display
19530 gitk: Fix a couple more bugs in the path limiting
19531 gitk: Simplify the code for finding commits
19532 gitk: Use the UI font for the diff/old version/new version radio buttons
19534 Pierre Habouzit (80):
19535 Rework strbuf API and semantics.
19536 Simplify strbuf uses in archive-tar.c using strbuf API
19537 fast-import: Use strbuf API, and simplify cmd_data()
19538 mktree: Simplify write_tree() using strbuf API
19539 Use strbuf API in apply, blame, commit-tree and diff
19540 Use strbuf API in buitin-rerere.c
19541 Use strbuf API in cache-tree.c
19542 Strbuf API extensions and fixes.
19543 Change semantics of interpolate to work like snprintf.
19544 Rework pretty_print_commit to use strbufs instead of custom buffers.
19545 Use strbuf_read in builtin-fetch-tool.c.
19546 Use strbufs to in read_message (imap-send.c), custom buffer--.
19547 Replace all read_fd use with strbuf_read, and get rid of it.
19548 New strbuf APIs: splice and attach.
19549 Rewrite convert_to_{git,working_tree} to use strbuf's.
19550 Now that cache.h needs strbuf.h, remove useless includes.
19551 builtin-apply: use strbuf's instead of buffer_desc's.
19552 Refactor replace_encoding_header.
19553 Remove preemptive allocations.
19554 Drop strbuf's 'eof' marker, and make read_line a first class citizen.
19555 fast-import was using dbuf's, replace them with strbuf's.
19556 fast-import optimization:
19557 Add xmemdupz() that duplicates a block of memory, and NUL terminates it.
19558 Use xmemdupz() in many places.
19559 Fix the expansion pattern of the pseudo-static path buffer.
19560 nfv?asprintf are broken without va_copy, workaround them.
19561 strbuf API additions and enhancements.
19562 Rework unquote_c_style to work on a strbuf.
19563 Full rework of quote_c_style and write_name_quoted.
19564 sq_quote_argv and add_to_string rework with strbuf's.
19566 Make builtin-rerere use of strbuf nicer and more efficient.
19567 Small cache_tree_write refactor.
19568 double free in builtin-update-index.c
19569 strbuf change: be sure ->buf is never ever NULL.
19570 strbuf_read_file enhancement, and use it.
19571 Make read_patch_file work on a strbuf.
19572 Fix in-place editing functions in convert.c
19573 Add some fancy colors in the test library when terminal supports it.
19574 Support a --quiet option in the test-suite.
19575 fast-import.c: fix regression due to strbuf conversion
19576 Add a simple option parser.
19577 parse-options: be able to generate usages automatically
19578 parse-options: make some arguments optional, add callbacks.
19579 Add shortcuts for very often used options.
19580 parse-options: allow callbacks to take no arguments at all.
19581 Make builtin-rm.c use parse_options.
19582 Make builtin-mv.c use parse-options
19583 Make builtin-branch.c use parse_options.
19584 Make builtin-describe.c use parse_options
19585 Make builtin-revert.c use parse_options.
19586 Make builtin-update-ref.c use parse_options
19587 Make builtin-symbolic-ref.c use parse_options.
19588 Make builtin-for-each-ref.c use parse-opts.
19589 Make builtin-fsck.c use parse_options.
19590 Make builtin-count-objects.c use parse_options.
19591 Make builtin-name-rev.c use parse_options.
19592 Make builtin-pack-refs.c use parse_options.
19593 git-fetch: be even quieter.
19594 Some better parse-options documentation.
19595 Add a parseopt mode to git-rev-parse to bring parse-options to shell scripts.
19596 Update git-sh-setup(1) to allow transparent use of git-rev-parse --parseopt
19597 Migrate git-clean.sh to use git-rev-parse --parseopt.
19598 Migrate git-clone to use git-rev-parse --parseopt
19599 Migrate git-am.sh to use git-rev-parse --parseopt
19600 Migrate git-merge.sh to use git-rev-parse --parseopt
19601 Migrate git-instaweb.sh to use git-rev-parse --parseopt
19602 Migrate git-checkout.sh to use git-rev-parse --parseopt --keep-dashdash
19603 Migrate git-quiltimport.sh to use git-rev-parse --parseopt
19604 Migrate git-repack.sh to use git-rev-parse --parseopt
19605 sh-setup: don't let eval output to be shell-expanded.
19606 parse-options new features.
19607 Use OPT_SET_INT and OPT_BIT in builtin-branch
19608 Use OPT_BIT in builtin-for-each-ref
19609 Use OPT_BIT in builtin-pack-refs
19610 Make the diff_options bitfields be an unsigned with explicit masks.
19611 Reorder diff_opt_parse options more logically per topics.
19612 parse-options: Allow to hide options from the default usage.
19613 builtin-commit.c: export GIT_INDEX_FILE for launch_editor as well.
19614 Invert numbers and names in the git-shortlog summary mode.
19617 Open external merge tool with original file extensions for all three files
19619 Ralf Wildenhues (10):
19620 manual: Fix or remove em dashes.
19621 Fix some typos, punctuation, missing words, minor markup.
19622 Fix wording in push definition.
19623 manual: Fix example finding commits referencing given content.
19624 manual: add some markup.
19625 manual: use 'URL' instead of 'url'.
19626 git-cherry-pick: improve description of -x.
19627 Fix minor nits in configure.ac
19628 git-bisect.sh: Fix sed script to work with AIX and BSD sed.
19629 Document all help keys in "git add -i" patch mode.
19632 Export format_commit_message()
19633 archive: specfile support (--pretty=format: in archive files)
19634 Remove unused function convert_sha1_file()
19636 archive: specfile syntax change: "$Format:%PLCHLDR$" instead of just "%PLCHLDR" (take 2)
19637 archive: rename attribute specfile to export-subst
19638 archive: fix subst file generation
19639 Correct some sizeof(size_t) != sizeof(unsigned long) typing errors
19641 --pretty=format: on-demand format expansion
19642 --pretty=format: parse commit message only once
19643 add strbuf_adddup()
19644 --format=pretty: avoid calculating expensive expansions twice
19647 Define NO_MEMMEM of FreeBSD as it lacks the function
19649 Robert Schiele (2):
19650 git-gui: install-sh from automake does not like -m755
19651 install-sh from automake does not like -m without delimiting space
19653 Robin Rosenberg (1):
19654 cvsexportcommit: Add switch to specify CVS workdir
19657 git-svn: fix test for trunk svn (commit message not needed)
19658 git-svn: fix test for trunk svn (transaction out of date)
19659 git-svn: handle changed svn command-line syntax
19660 gitk: disable colours when calling git log
19661 Allow HTTP proxy to be overridden in config
19662 Add remote.<name>.proxy
19664 Scott R Parish (7):
19665 "git" returns 1; "git help" and "git help -a" return 0
19666 remove unused/unneeded "pattern" argument of list_commands
19667 "current_exec_path" is a misleading name, use "argv_exec_path"
19668 list_commands(): simplify code by using chdir()
19669 use only the $PATH for exec'ing git commands
19670 include $PATH in generating list of commands for "help -a"
19671 shell should call the new setup_path() to setup $PATH
19673 Sergei Organov (7):
19674 core-tutorial.txt: Fix git-show-branch example and its description
19675 user-manual.txt: fix a few mistakes
19676 user-manual: minor rewording for clarity.
19677 Documentation: customize diff-options depending on particular command
19678 user-manual.txt: minor clarification.
19679 Documentation: fix git-clone manpage not to refer to itself
19680 Let git-help prefer man-pages installed with this version of git
19683 Add more tests for git-clean
19684 Make git-clean a builtin
19685 Teach git clean to use setup_standard_excludes()
19686 Make git status usage say git status instead of git commit
19688 Shawn O. Pearce (106):
19689 git-gui: Locate the library directory early during startup
19690 git-gui: Initialize Tcl's msgcat library for internationalization
19691 git-gui: Update po/README as symlink process is not necessary
19692 git-gui: Correct stock message for 'Invalid font specified in %s'
19693 git-gui: Quiet the msgfmt part of the make process
19694 git-gui: Ensure msgfmt failure stops GNU make
19695 Define NO_MEMMEM on Darwin as it lacks the function
19696 git-gui: Mark revision chooser tooltip for translation
19697 git-gui: Localize commit/author dates when displaying them
19698 git-gui: Support context-sensitive i18n
19699 git-gui: Document the new i18n context support
19700 git-gui: Make the tree browser also use lightgray selection
19701 git-gui: Paper bag fix missing translated strings
19702 Correct builtin-fetch to handle + in refspecs
19703 Fix off by one bug in reflog messages written by builtin-fetch
19704 Remove unnecessary debugging from builtin-fetch
19705 Remove unused unpacklimit variable from builtin-fetch
19706 Replace custom memory growth allocator with ALLOC_GROW
19707 Simplify fetch transport API to just one function
19708 Refactor index-pack "keep $sha1" handling for reuse
19709 Remove pack.keep after ref updates in git-fetch
19710 Always ensure the pack.keep file is removed by git-fetch
19711 Fix builtin-fetch memory corruption by not overstepping array
19712 Backup the array passed to fetch_pack so we can free items
19713 Properly cleanup in http_cleanup so builtin-fetch does not segfault
19714 Don't bother passing ref log details to walker in builtin-fetch
19715 Cleanup duplicate initialization code in transport_get
19716 Add transport.h to LIB_H as transport.o is in LIB_OBJS
19717 Remove unnecessary 'fetch' argument from transport_get API
19718 Allow builtin-fetch to work on a detached HEAD
19719 Don't configure remote "." to fetch everything to itself
19720 Remove more debugging from builtin-fetch
19721 builtin-fetch: Don't segfault on "fetch +foo"
19722 Don't attempt to merge non-existant remotes in t5515
19723 Correct handling of branch.$name.merge in builtin-fetch
19724 Avoid printing unnecessary warnings during fetch and push
19725 Use 'unsigned:1' when we mean boolean options
19726 Rename remote.uri to remote.url within remote handling internals
19727 Refactor struct transport_ops inlined into struct transport
19728 Always obtain fetch-pack arguments from struct fetch_pack_args
19729 Ensure builtin-fetch honors {fetch,transfer}.unpackLimit
19730 Fix memory leaks when disconnecting transport instances
19731 git-gui: Fix missing i18n markup in push/fetch windows
19732 git-gui: Support native Win32 Tcl/Tk under Cygwin
19733 git-gui: Refactor some UI init to occur earlier
19734 git-gui: Allow users to choose/create/clone a repository
19735 git-gui: Avoid console scrollbars unless they are necessary
19736 git-gui: Don't bother showing OS error message about hardlinks
19737 git-gui: Keep the UI responsive while counting objects in clone
19738 git-gui: Copy objects/info/alternates during standard clone
19739 Cleanup style nit of 'x == NULL' in remote.c
19740 Cleanup unnecessary break in remote.c
19741 Prevent send-pack from segfaulting when a branch doesn't match
19742 git-gui: Don't delete console window namespaces too early
19743 git-gui: Don't delete scrollbars in console windows
19744 git-gui: Switch the git-gui logo to Henrik Nyh's logo
19745 git-gui: Make the status bar easier to read in the setup wizard
19746 git-gui: Use Henrik Nyh's git logo icon on Windows systems
19747 git-gui: Support a native Mac OS X application bundle
19748 git-gui: Refer to ourselves as "Git Gui" and not "git-gui"
19749 git-gui: Allow forced push into remote repository
19750 git-gui: Refactor Henrik Nyh's logo into its own procedure
19751 git-gui: Refactor about dialog code into its own module
19752 git-gui: Include our Git logo in the about dialog
19753 git-gui: Use progress meter in the status bar during index updates
19754 git-gui: Consolidate the Fetch and Push menus into a Remote menu
19755 git-gui: Bind Cmd-, to Preferences on Mac OS X
19756 git-gui: Shorten the staged/unstaged changes title bar text
19757 git-gui: Updated po strings based on current sources
19758 git-gui: Move load_config procedure below git-version selection
19759 git-gui: Refactor git-config --list parsing
19760 git-gui: Support LFs embedded in config file values
19761 git-gui: Change repository browser radio buttons to hyperlinks
19762 git-gui: Offer repository management features in menu bar
19763 git-gui: Fix bind errors when switching repository chooser panels
19764 git-gui: Disable the text widget in the repository chooser
19765 git-gui: Bind n/c/o accelerators in repository chooser
19766 git-gui: Ensure copyright message is correctly read as UTF-8
19767 git-gui: Use proper Windows shortcuts instead of bat files
19768 git-gui: Support cloning Cygwin based work-dirs
19769 git-gui: Collapse $env(HOME) to ~/ in recent repositories on Windows
19770 git-gui: Honor a config.mak in git-gui's top level
19771 Fix 'push --all branch...' error handling
19772 Support 'push --dry-run' for rsync transport
19773 Support 'push --dry-run' for http transport
19774 git-gui: Paper bag fix the global config parsing
19775 Change 'Deltifying objects' to 'Compressing objects'
19776 Teach prune-packed to use the standard progress meter
19777 Stop displaying "Pack pack-$ID created." during git-gc
19778 Avoid scary errors about tagged trees/blobs during git-fetch
19779 Define compat version of mkdtemp for systems lacking it
19780 Improved const correctness for strings
19781 Use PRIuMAX instead of 'unsigned long long' in show-index
19782 git-gui: Make sure we get errors from git-update-index
19783 git-gui: Protect against bad translation strings
19784 git-gui: Allow users to set font weights to bold
19785 Reteach builtin-ls-remote to understand remotes
19786 git-gui: Bind Meta-T for "Stage To Commit" menu action
19787 git-fetch: Always fetch tags if the object they reference exists
19788 run-command: Support sending stderr to /dev/null
19789 rev-list: Introduce --quiet to avoid /dev/null redirects
19790 git-fetch: avoid local fetching from alternate (again)
19791 Handle broken vsnprintf implementations in strbuf
19792 Fix warning about bitfield in struct ref
19794 Remove git-status from list of scripts as it is builtin
19796 Shun Kei Leung (1):
19797 git-p4: Fix typo in --detect-labels
19799 Simon Hausmann (10):
19800 git-p4: Always call 'p4 sync ...' before submitting to Perforce.
19801 git-p4: After submission to p4 always synchronize from p4 again (into refs/remotes). Whether to rebase HEAD or not is still left as question to the end-user.
19802 git-p4: Cleanup; moved the code for getting a sorted list of p4 changes for a list of given depot paths into a standalone method.
19803 git-p4: Cleanup; moved the code to import a list of p4 changes using fast-import into a separate member function of P4Sync.
19804 git-p4: Cleanup; Turn self.revision into a function local variable (it's not used anywhere outside the function).
19805 git-p4: Cleanup; moved the code for the initial #head or revision import into a separate function, out of P4Sync.run.
19806 git-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ref (for example foo -> refs/remotes/p4/<project>/foo) into a separate method.
19807 git-p4: Added support for automatically importing newly appearing perforce branches.
19808 git-p4: When skipping a patch as part of "git-p4 submit" make sure we correctly revert to the previous state of the files using "p4 revert".
19809 git-p4: Fix direct import from perforce after fetching changes through git from origin
19812 Make mailsplit and mailinfo strip whitespace from the start of the input
19814 Stefan Sperling (1):
19815 Fix pool handling in git-svnimport to avoid memory leaks.
19817 Steffen Prohaska (16):
19818 git-gui: add directory git-gui is located in to PATH (on Windows)
19819 git-gui: set NO_MSGFMT to force using pure tcl replacement in msysgit
19820 git-gui: add mingw specific startup wrapper
19821 git-gui: offer a list of recent repositories on startup
19822 mergetool: use path to mergetool in config var mergetool.<tool>.path
19823 mergetool: add support for ECMerge
19824 mergetool: avoid misleading message "Resetting to default..."
19825 Fix comment in strbuf.h to use correct name strbuf_avail()
19826 push: mention --verbose option in documentation
19827 push: teach push to pass --verbose option to transport layer
19828 push: support pushing HEAD to real branch name
19829 add refname_match()
19830 push: use same rules as git-rev-parse to resolve refspecs
19831 refactor fetch's ref matching to use refname_match()
19832 Use is_absolute_path() in diff-lib.c, lockfile.c, setup.c, trace.c
19833 sha1_file.c: Fix size_t related printf format warnings
19836 Add a message explaining that automatic GC is about to start
19837 builtin-fetch: Add "-q" as a synonym for "--quiet"
19838 git-svn: Don't create a "master" branch every time rebase is run
19841 Don't checkout the full tree if avoidable
19844 Make the list of common commands more exclusive
19845 Remove hint to use "git help -a"
19847 Thomas Harning (1):
19848 git-merge-ours: make it a builtin.
19850 Uwe Kleine-König (1):
19851 send-email: apply --suppress-from to S-o-b and cc-cmd
19854 git-svn: add a show-externals command.
19857 Added a test for fetching remote tags when there is not tags.
19859 Wincent Colaiuta (21):
19860 Further clarify clean.requireForce changes
19861 Authenticate only once in git-send-email
19862 Refactor patch_update_cmd
19863 Teach builtin-add to pass multiple paths to git-add--interactive
19864 Add path-limiting to git-add--interactive
19865 Add "--patch" option to git-add--interactive
19866 Fix typo in draft 1.5.4 release notes
19867 Highlight keyboard shortcuts in git-add--interactive
19868 revert/cherry-pick: Allow overriding the help text by the calling Porcelain
19869 add -i: allow prefix highlighting for "Add untracked" as well.
19870 git-add -i: add help text for list-and-choose UI
19871 Silence iconv warnings on Leopard
19872 Teach "git add -i" to colorize whitespace errors
19873 Allow --no-verify to bypass commit-msg hook
19874 Documentation: fix --no-verify documentation for "git commit"
19875 Add tests for pre-commit and commit-msg hooks
19876 Interactive editor tests for commit-msg hook
19877 Style fixes for pre-commit hook tests
19878 Use "whitespace" consistently
19879 Documentation: minor grammar fix for "git apply"
19880 Fix "diff --check" whitespace detection
19883 Initial Chinese translation for git-gui
19884 git-gui: Added initial version of po/glossary/zh_cn.po
19887 gitweb: use Perl built-in utf8 function for UTF-8 decoding.
19890 Version v1.5.3.8; changes since v1.5.3.7:
19891 -----------------------------------------
19894 Change from using email.com to example.com as example domain, as per RFC 2606.
19897 git-svn: support for funky branch and project names over HTTP(S)
19898 git-svn: clarify the "Ignoring error from SVN" piece
19901 t9600: test cvsimport from CVS working tree
19902 clone: correctly report http_fetch errors
19903 git-send-email: avoid duplicate message-ids
19906 config.c:store_write_pair(): don't read the byte before a malloc'd buffer.
19908 Junio C Hamano (3):
19909 git grep shows the same hit repeatedly for unmerged paths
19910 git-am -i: report rewritten title
19913 Nguyễn Thái Ngọc Duy (3):
19914 Add missing inside_work_tree setting in setup_git_directory_gently
19915 Do check_repository_format() early
19916 Do check_repository_format() early (re-fix)
19919 Version v1.5.3.7; changes since v1.5.3.6:
19920 -----------------------------------------
19922 Björn Steinbrink (3):
19923 git-commit.sh: Fix usage checks regarding paths given when they do not make sense
19924 t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH
19925 git-commit: Add tests for invalid usage of -a/--interactive with paths
19928 config: correct core.loosecompression documentation
19929 config: clarify compression defaults
19931 J. Bruce Fields (7):
19932 git-remote.txt: fix example url
19933 user-manual: mention "..." in "Generating diffs", etc.
19934 Documentation: Fix references to deprecated commands
19935 user-manual: define "branch" and "working tree" at start
19936 user-manual: failed push to public repository
19937 user-manual: clarify language about "modifying" old commits
19938 user-manual: recovering from corruption
19941 Improve description of git-branch -d and -D in man page.
19944 send-email: add transfer encoding header with content-type
19945 Add basic cvsimport tests
19946 cvsimport: use rev-parse to support packed refs
19947 cvsimport: miscellaneous packed-ref fixes
19948 cvsimport: fix usage of cvsimport.module
19950 Johannes Schindelin (2):
19951 bundle create: keep symbolic refs' names instead of resolving them
19952 Replace the word 'update-cache' by 'update-index' everywhere
19955 t7003-filter-branch: Fix test of a failing --msg-filter.
19957 Junio C Hamano (11):
19958 format-patch -s: add MIME encoding header if signer's name requires so
19959 test format-patch -s: make sure MIME content type is shown as needed
19960 ce_match_stat, run_diff_files: use symbolic constants for readability
19961 git-add: make the entry stat-clean after re-adding the same contents
19962 t2200: test more cases of "add -u"
19963 Make test scripts executable.
19964 Fix sample pre-commit hook
19965 git-checkout: describe detached head correctly
19966 scripts: do not get confused with HEAD in work tree
19967 Fix typo in t4008 test title
19970 Linus Torvalds (1):
19971 Fix rev-list when showing objects involving submodules
19974 Doc fix for git-reflog: mention @{...} syntax, and <ref> in synopsys.
19977 Make GIT_INDEX_FILE apply to git-commit
19979 Steffen Prohaska (1):
19980 user-manual: Add section "Why bisecting merge commits can be harder ..."
19983 Version v1.5.3.6; changes since v1.5.3.5:
19984 -----------------------------------------
19987 stop t1400 hiding errors in tests
19989 Ask Bjørn Hansen (1):
19990 When exec() fails include the failing command in the error message
19992 Benoit Sigoure (2):
19993 git-send-email: Change the prompt for the subject of the initial message.
19994 git-svn: prevent dcommitting if the index is dirty.
19997 cvsexportcommit: fix for commits that do not have parents
19999 Christian Couder (1):
20000 for-each-ref: fix off by one read.
20002 David D. Kilzer (2):
20003 RelNotes-1.5.3.5: fix typo
20004 RelNotes-1.5.3.5: fix another typo
20007 Improve accuracy of check for presence of deflateBound.
20010 git-svn: fix dcommit clobbering when committing a series of diffs
20011 git-svn: t9114: verify merge commit message in test
20014 git-diff.txt: add section "output format" describing the diff formats
20015 git-cvsimport: really convert underscores in branch names to dots with -u
20016 git-daemon: fix remote port number in log entry
20017 git-mailsplit: with maildirs not only process cur/, but also new/
20019 Jakub Narebski (1):
20020 gitweb: Update config file example for snapshot feature in gitweb/INSTALL
20023 git-branch: remove mention of non-existent '-b' option
20024 git-send-email: add charset header if we add encoded 'From'
20027 replace reference to git-rm with git-reset in git-commit doc
20029 Johannes Schindelin (1):
20030 Add Documentation/CodingGuidelines
20033 Remove escaping of '|' in manpage option sections
20034 instaweb: Minor cleanups and fixes for potential problems
20035 Documentation: Fix man page breakage with DocBook XSL v1.72
20037 Jonathan del Strother (1):
20038 Fixing path quoting in git-rebase
20040 Junio C Hamano (12):
20041 grep with unmerged index
20042 refresh_index_quietly(): express "optional" nature of index writing better
20043 Makefile: add missing dependency on wt-status.h
20044 Start preparing for 1.5.3.6
20045 t/t3404: fix test for a bogus todo file.
20046 revert/cherry-pick: allow starting from dirty work tree.
20047 git-clean: honor core.excludesfile
20048 core.excludesfile clean-up
20049 Fix per-directory exclude handing for "git add"
20050 Update draft release notes for 1.5.3.6
20051 grep -An -Bm: fix invocation of external grep command
20054 Kristian Høgsberg (1):
20055 Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites.
20057 Marco Costalba (1):
20058 Remove a couple of duplicated include
20061 Delay pager setup in git blame
20064 print warning/error/fatal messages in one shot
20065 git-hash-object should honor config variables
20066 fix index-pack with packs >4GB containing deltas on 32-bit machines
20068 Ralf Wildenhues (3):
20069 git-clone.txt: Improve --depth description.
20070 Avoid a few unportable, needlessly nested "...`...".
20071 Fix sed string regex escaping in module_name.
20073 Sergei Organov (6):
20074 git-filter-branch.txt: fix a typo.
20075 git-format-patch.txt: fix explanation of an example.
20076 Documentation: quote commit messages consistently.
20077 SubmittingPatches: improve the 'Patch:' section of the checklist
20078 core-tutorial.txt: Fix argument mistake in an example.
20079 git-remote.txt: fix typo
20081 Shawn O. Pearce (2):
20082 Fix memory leak in traverse_commit_list
20083 Don't allow fast-import tree delta chains to exceed maximum depth
20085 Vincent Zanotti (1):
20086 gitweb: correct month in date display for atom feeds
20088 Wincent Colaiuta (2):
20089 Grammar fixes for gitattributes documentation
20090 Fix t9101 test failure caused by Subversion "auto-props"
20093 Version v1.5.3.5; changes since v1.5.3.4:
20094 -----------------------------------------
20097 Ensure we add directories in the correct order
20100 Fix generation of perl/perl.mak
20102 Andrew Clausen (1):
20103 helpful error message when send-pack finds no refs in common.
20105 Aurelien Bompard (1):
20106 honor the http.sslVerify option in shell scripts
20108 Benoit Sigoure (1):
20109 Fix a small memory leak in builtin-add
20111 Björn Steinbrink (3):
20112 Fix --strategy parsing in git-rebase--interactive.sh
20113 git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.
20114 git-rebase--interactive.sh: Make 3-way merge strategies work for -p.
20116 Brian Gernhardt (1):
20117 cvsserver: Use exit 1 instead of die when req_Root fails.
20119 Frank Lichtenheld (1):
20120 git-config: don't silently ignore options after --list
20123 git-config: handle --file option with relative pathname properly
20124 git-config: print error message if the config file cannot be read
20126 Jean-Luc Herren (2):
20127 git add -i: Fix parsing of abbreviated hunk headers
20128 git add -i: Remove unused variables
20131 send-pack: respect '+' on wildcard refspecs
20133 Joakim Tjernlund (1):
20134 Improve receive-pack error message about funny ref creation
20136 Johannes Schindelin (5):
20137 clear_commit_marks(): avoid deep recursion
20138 rebase -i: use diff plumbing instead of porcelain
20139 Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREE
20140 fix filter-branch documentation
20141 filter-branch: update current branch when rewritten
20143 Julian Phillips (1):
20144 fast-import: Fix argument order to die in file_change_m
20146 Junio C Hamano (8):
20147 git-remote: fix "Use of uninitialized value in string ne"
20148 sha1_file.c: avoid gcc signed overflow warnings
20149 merge-recursive.c: mrtree in merge() is not used before set
20150 RelNotes-1.5.3.5: describe recent fixes
20151 Prevent send-pack from segfaulting (backport from 'master')
20152 git-merge: document but discourage the historical syntax
20153 Update GIT 1.5.3.5 Release Notes
20157 Make merge-recursive honor diff.renamelimit
20159 Linus Torvalds (6):
20160 Fix embarrassing "git log --follow" bug
20161 Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
20162 git-blame shouldn't crash if run in an unmerged tree
20163 Avoid scary errors about tagged trees/blobs during git-fetch
20164 Fix directory scanner to correctly ignore files without d_type
20165 Fix diffcore-break total breakage
20167 Mathias Megyei (1):
20168 Do not remove distributed configure script
20170 Michael W. Olson (1):
20171 Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in example
20173 Michele Ballabio (2):
20174 git-reflog: document --verbose
20175 git-archive: document --exec
20178 cherry-pick/revert: more compact user direction message
20180 Patrick Welche (1):
20181 Define NI_MAXSERV if not defined by operating system
20183 Ralf Wildenhues (1):
20184 gitk.txt: Fix markup.
20186 Robert Schiele (1):
20187 fixing output of non-fast-forward output of post-receive-email
20189 Sergei Organov (1):
20190 core-tutorial: Use new syntax for git-merge.
20192 Shawn O. Pearce (17):
20193 git-gui: Display message box when we cannot find git in $PATH
20194 git-gui: Handle starting on mapped shares under Cygwin
20195 git-gui: Ensure .git/info/exclude is honored in Cygwin workdirs
20196 git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk
20197 git-gui: Don't crash when starting gitk from a browser session
20198 Whip post 1.5.3.4 maintenance series into shape.
20199 Correct typos in release notes for 1.5.3.5
20200 Avoid 'expr index' on Mac OS X as it isn't supported
20201 Document additional 1.5.3.5 fixes in release notes
20202 Yet more 1.5.3.5 fixes mentioned in release notes
20203 Avoid invoking diff drivers during git-stash
20204 Further 1.5.3.5 fixes described in release notes
20205 Paper bag fix diff invocation in 'git stash show'
20206 git-gui: Correctly report failures from git-write-tree
20207 git-gui: Handle progress bars from newer gits
20208 git-gui: Don't display CR within console windows
20209 Describe more 1.5.3.5 fixes in release notes
20212 git-gui: Avoid using bold text in entire gui for some fonts
20214 Steffen Prohaska (2):
20215 git-gui: accept versions containing text annotations, like 1.5.3.mingw.1
20216 attr: fix segfault in gitattributes parsing code
20219 Version v1.5.3.4; changes since v1.5.3.3:
20220 -----------------------------------------
20223 post-receive-hook: Remove the From field from the generated email header so that the pusher's name is used
20226 Add test case for ls-files --with-tree
20228 Federico Mena Quintero (4):
20229 Say when --track is useful in the git-checkout docs.
20230 Add documentation for --track and --no-track to the git-branch docs.
20231 Note that git-branch will not automatically checkout the new branch
20232 Make git-pull complain and give advice when there is nothing to merge with
20235 git-remote: exit with non-zero status after detecting errors.
20237 Jean-Luc Herren (2):
20238 git-add--interactive: Allow Ctrl-D to exit
20239 git-add--interactive: Improve behavior on bogus input
20242 diffcore-rename: cache file deltas
20245 Mention 'cpio' dependency in INSTALL
20247 Johannes Schindelin (2):
20248 rebase -i: squash should retain the authorship of the _first_ commit
20249 Fix typo in config.txt
20251 Junio C Hamano (5):
20252 Whip post 1.5.3.3 maintenance series into shape.
20253 git-commit: initialize TMP_INDEX just to be sure.
20254 for-each-ref: fix %(numparent) and %(parent)
20255 rename diff_free_filespec_data_large() to diff_free_filespec_blob()
20259 Must not modify the_index.cache as it may be passed to realloc at some point.
20262 git stash: document apply's --index switch
20264 Robert Schiele (1):
20265 the ar tool is called gar on some systems
20267 Steffen Prohaska (1):
20268 fixed link in documentation of diff-options
20271 Version v1.5.3.3; changes since v1.5.3.2:
20272 -----------------------------------------
20275 Move make_cache_entry() from merge-recursive.c into read-cache.c
20278 quiltimport: Skip non-existent patches
20281 Detect exec bit in more cases.
20284 Supplant the "while case ... break ;; esac" idiom
20287 git-svn: don't attempt to spawn pager if we don't want one
20290 Fixed minor typo in t/t9001-send-email.sh test command line.
20292 J. Bruce Fields (1):
20293 user-manual: don't assume refs are stored under .git/refs
20295 Jakub Narebski (2):
20296 gitweb: Remove parse_from_to_diffinfo code from git_patchset_body
20297 gitweb: No difftree output for trivial merge
20300 unexpected Make output (e.g. from --debug) causes build failure
20301 Do not over-quote the -f envelopesender value.
20303 Johannes Schindelin (1):
20304 apply: get rid of --index-info in favor of --build-fake-ancestor
20307 gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'crlf' interaction.
20308 gitattributes.txt: Be more to the point in the filter driver description.
20310 Junio C Hamano (3):
20311 Documentation/git-lost-found.txt: drop unnecessarily duplicated name.
20312 Mergetool generating blank files (1.5.3)
20315 Linus Torvalds (1):
20316 Fix revision log diff setup, avoid unnecessary diff generation
20319 Move the paragraph specifying where the .idx and .pack files should be
20320 Conjugate "search" correctly in the git-prune-packed man page.
20323 user-manual: Explain what submodules are good for.
20326 User Manual: add a chapter for submodules
20327 git-bundle: fix commandline examples in the manpage
20330 core-tutorial: correct URL
20333 Fix spelling of overridden in documentation
20336 mergetool: fix emerge when running in a subdirectory
20337 mergetool: Fix typo in options passed to kdiff3
20340 Version v1.5.3.2; changes since v1.5.3.1:
20341 -----------------------------------------
20343 Alexandre Julliard (1):
20344 hooks--update: Explicitly check for all zeros for a deleted ref.
20346 Benoit Sigoure (1):
20347 Add test to check recent fix to "git add -u"
20350 git-tag -s must fail if gpg cannot sign the tag.
20353 git-send-email.perl: Add angle brackets to In-Reply-To if necessary
20355 Dmitry V. Levin (2):
20356 Makefile: Add cache-tree.h to the headers list
20357 git-commit: Disallow amend if it is going to produce an empty non-merge commit
20360 git-svn: fix "Malformed network data" with svn:// servers
20361 git-svn: understand grafts when doing dcommit
20362 Documentation/git-svn: updated design philosophy notes
20365 git-gui: lib/index.tcl: handle files with % in the filename properly
20366 git-clone: improve error message if curl program is missing or not executable
20368 J. Bruce Fields (13):
20369 user-manual: adjust section levels in "git internals"
20370 user-manual: move object format details to hacking-git chapter
20371 user-manual: rename "git internals" to "git concepts"
20372 user-manual: create new "low-level git operations" chapter
20373 user-manual: rewrite index discussion
20374 user-manual: reorder commit, blob, tree discussion
20375 user-manual: rewrite object database discussion
20376 user-manual: move packfile and dangling object discussion
20377 user-manual: fix introduction to packfiles
20378 user-manual: todo updates and cleanup
20379 documentation: replace Discussion section by link to user-manual chapter
20380 core-tutorial: minor cleanup
20381 git-apply: fix whitespace stripping
20384 Documentation/git-archive.txt: a couple of clarifications.
20386 Jean-Luc Herren (1):
20387 stash: end index commit log with a newline
20390 git-push: documentation and tests for pushing only branches
20392 Johannes Schindelin (2):
20393 revision walker: --cherry-pick is a limited operation
20394 apply --index-info: fall back to current index for mode changes
20396 Junio C Hamano (13):
20397 git-apply: do not read past the end of buffer
20398 git-add -u: do not barf on type changes
20399 git-format-patch --in-reply-to: accept <message@id> with angle brackets
20400 diff --no-index: do not forget to run diff_setup_done()
20401 Documentation/git-config.txt: AsciiDoc tweak to avoid leading dot
20402 Split grep arguments in a way that does not requires to add /dev/null.
20403 git-sh-setup: typofix in comments
20404 send-email: make message-id generation a bit more robust
20405 git-commit: Allow partial commit of file removal.
20406 git-commit: partial commit of paths only removed from the index
20407 Document ls-files --with-tree=<tree-ish>
20408 t/t4014: test "am -3" with mode-only change.
20411 Linus Torvalds (1):
20412 Fix the rename detection limit checking
20414 Matthias Urlichs (1):
20415 git-svnimport: Use separate arguments in the pipe for git-rev-parse
20418 (cvs|svn)import: Ask git-tag to overwrite old tags.
20420 Michele Ballabio (2):
20421 git-gui: show unstaged symlinks in diff viewer
20422 git-gui: handle "deleted symlink" diff marker
20425 Documentation / grammer nit
20428 fix doc for --compression argument to pack-objects
20430 Pierre Habouzit (1):
20431 Fix lapsus in builtin-apply.c
20433 Ramsay Allan Jones (1):
20434 Fix a test failure (t9500-*.sh) on cygwin
20436 Shawn O. Pearce (17):
20437 git-gui: Correct starting of git-remote to handle -w option
20438 git-gui: Fix detaching current branch during checkout
20439 git-gui: Properly set the state of "Stage/Unstage Hunk" action
20440 Don't allow contrib/workdir/git-new-workdir to trash existing dirs
20441 Cleanup unnecessary file modifications in t1400-update-ref
20442 Include a git-push example for creating a remote branch
20443 git-gui: Disable Tk send in all git-gui sessions
20444 git-gui: Avoid use of libdir in Makefile
20445 git-gui: Assume untracked directories are Git submodules
20446 git-gui: Trim trailing slashes from untracked submodule names
20447 Make --no-thin the default in git-push to save server resources
20448 git-gui: Don't delete send on Windows as it doesn't exist
20449 git-gui: Make backporting changes from i18n version easier
20450 git-gui: Font chooser to handle a large number of font families
20451 git-gui: Provide 'uninstall' Makefile target to undo an installation
20452 git-gui: Paper bag fix "Commit->Revert" format arguments
20453 git-gui: Disable native platform text selection in "lists"
20455 Sven Verdoolaege (1):
20456 git-diff: don't squelch the new SHA1 in submodule diffs
20458 Ulrik Sverdrup (1):
20459 Remove duplicate note about removing commits with git-filter-branch
20462 Fixed update-hook example allow-users format.
20465 Version v1.5.3.1; changes since v1.5.3:
20466 ---------------------------------------
20468 Junio C Hamano (2):
20469 Typofix: 1.5.3 release notes
20470 GIT 1.5.3.1: obsolete git-p4 in RPM spec file.
20473 Version v1.5.3; changes since v1.5.3-rc7:
20474 -----------------------------------------
20477 Temporary fix for stack smashing in mailinfo
20480 git-tag: Fix -l option to use better shell style globs.
20483 git-svn: fix dcommit clobbering upstream when committing multiple changes
20485 Giuseppe Bilotta (2):
20486 git-filter-branch: more detailed USAGE
20487 git-filter-branch: document --original option
20490 git-send-email --cc-cmd
20492 Johannes Schindelin (5):
20493 completion: also complete git-log's --left-right and --cherry-pick option
20494 filter-branch: fix remnants of old syntax in documentation
20495 rebase -i: mention the option to split commits in the man page
20496 filter-branch: provide the convenience functions also for commit filters
20497 filter-branch: introduce convenience function "skip_commit"
20500 rebase -m: Fix incorrect short-logs of already applied commits.
20502 Junio C Hamano (13):
20503 git-daemon(1): assorted improvements.
20504 ls-files --error-unmatch: do not barf if the same pattern is given twice.
20505 Makefile: do not allow gnu make to remove test-*.o files
20506 filter-branch: make sure orig_namespace ends with a single slash.
20507 git-init: autodetect core.symlinks
20508 Make "git-log --" without paths behave the same as "git-log" without --
20509 Hopefully the final update to draft release notes for 1.5.3.
20510 git-svn: Protect against "diff.color = true".
20511 git-diff: resurrect the traditional empty "diff --git" behaviour
20512 Avoid one-or-more (\+) non BRE in sed scripts.
20513 Documentation: minor AsciiDoc mark-up fixes.
20514 Update my contact address as the maintainer.
20518 URL: allow port specification in ssh:// URLs
20521 Make git-archimport log entries more consistent
20524 fix same sized delta logic
20526 Paul Mackerras (1):
20527 gitk: Fix bug causing undefined variable error when cherry-picking
20529 Robin Rosenberg (1):
20530 Mention -m as an abbreviation for --merge
20532 Shawn O. Pearce (1):
20533 Teach bash about completing arguments for git-tag
20536 Fixing comment in merge strategies
20539 Version v1.5.3-rc7; changes since v1.5.3-rc6:
20540 ---------------------------------------------
20543 Fix git-remote for ActiveState Perl
20545 Alexandre Julliard (1):
20546 git.el: Avoid a lisp error when there's no current branch (detached HEAD).
20549 Documentation: For consistency, use CVS instead of cvs.
20550 Documentation: Correct various misspellings and typos.
20551 Make usage documentation for git-am consistent.
20552 Make usage documentation for git-add consistent.
20553 When nothing to git-commit, honor the git-status color setting.
20556 diff-delta.c: Fix broken skip calculation.
20557 Documentation/user-manual.txt: fix a few omissions of gitlink commands.
20558 Documentation/user-manual.txt: fix a few omissions of gitlink commands.
20559 git-svn.txt: fix an obvious misspelling.
20562 git.el: Added colors for dark background
20565 git-svn: update documentation with CAVEATS section
20566 git-svn: dcommit prints out the URL to be committed to
20568 J. Bruce Fields (5):
20569 user-manual: edit "ignoring files" for conciseness
20570 user-manual: minor editing for conciseness
20571 user-manual: introduce the word "commit" earlier
20572 user-manual: use pithier example commit
20573 user-manual: fix incorrect header level
20575 Jakub Narebski (1):
20576 gitweb: Fix escaping HTML of project owner in 'projects_list' and 'summary' views
20579 git-tag(1): Remove duplicate text
20581 Johannes Schindelin (2):
20582 rebase -i: fix squashing corner case
20583 name-rev: Fix non-shortest description
20585 Junio C Hamano (11):
20586 blame: check return value from read_sha1_file()
20587 pack-objects: check return value from read_sha1_file()
20588 RelNotes draft for 1.5.3 update.
20589 Fix initialization of a bare repository
20590 git --bare cmd: do not unconditionally nuke GIT_DIR
20591 git-merge: do up-to-date check also for all strategies
20592 Porcelain level "log" family should recurse when diffing.
20593 "format-patch --root rev" is the way to show everything.
20594 Documentation/git-diff: A..B and A...B cannot take tree-ishes
20595 format-patch documentation: reword to hint "--root <one-commit>" more clearly
20598 Linus Torvalds (1):
20599 Fix racy-git handling in git-write-tree.
20602 Describe two-dot and three-dot notation for diff endpoints.
20605 gitweb: Fix searchbox positioning
20606 gitweb: Lift any characters restriction on searched strings
20607 git-add: Make the "tried to add ignored file" error message less confusing
20608 git-add: Make the filename globbing note a bit clearer
20611 Fix breakage in git-rev-list.txt
20614 Documentation: update tar.umask default
20616 Sean Estabrooks (1):
20617 Reset terminal attributes when terminating git send-email
20619 Shawn O. Pearce (13):
20620 git-gui: Fix window manager problems on ion3
20621 git-gui: Allow git-merge to use branch names in conflict markers
20622 git-gui: Paper bag fix "Stage Hunk For Commit" in diff context menu
20623 git-gui: Fix "unoptimized loading" to not cause git-gui to crash
20624 Fix new-workdir (again) to work on bare repositories
20625 Suggest unsetting core.bare when using new-workdir on a bare repository
20626 Update bash completion with new 1.5.3 command line options
20627 Teach bash to complete ref arguments to git-describe
20628 Teach bash about git-submodule and its subcommands
20629 git-gui: Refactor diff pane popup support for future improvements
20630 git-gui: Do not offer to stage three-way diff hunks into the index
20631 git-gui: Correct 'git gui blame' in a subdirectory
20632 Don't segfault if we failed to inflate a packed delta
20634 Simon Hausmann (2):
20635 git-p4: Make 'git-p4 branches' work after an initial clone with git clone from an origin-updated repository.
20636 git-p4: Fix warnings about non-existant refs/remotes/p4/HEAD ref when running git-p4 sync the first time after a git clone.
20638 Stefan Sperling (1):
20639 Document -u option in git-svnimport man page
20641 martin f. krafft (2):
20642 git-svn init/clone --stdlayout option to default-init trunk/tags/branches
20643 Install man3 manpages to $PREFIX/share/man/man3 even for site installs
20646 Version v1.5.3-rc6; changes since v1.5.3-rc5:
20647 ---------------------------------------------
20650 Fix whitespace in "Format of STDIN stream" of fast-import
20651 Avoid using va_copy in fast-import: it seems to be unportable.
20653 Arjen Laarhoven (2):
20654 gitk: Make the date/time display configurable
20655 t1301-shared-repo.sh: fix 'stat' portability issue
20658 Clarify actual behavior of 'git add' and ignored files
20660 Brian Gernhardt (1):
20661 Minor clarifications to git-filter-branch usage and doc
20664 Fix misspelling of 'suppress' in docs
20667 git-svn: fix log with single revision against a non-HEAD branch
20670 gitk: Handle 'copy from' and 'copy to' in diff headers.
20672 Junio C Hamano (10):
20673 Fix "git add -u" data corruption.
20675 Fix read-tree merging more than 3 trees using 3-way merge
20676 Update documentation links for older releases.
20677 git-clone: allow --bare clone
20678 Documentation/git-rebase: fix an example
20679 Clean-up read-tree error condition.
20680 fast-import pull request
20681 git clone: do not issue warning while cloning locally across filesystems
20685 git-submodule: re-enable 'status' as the default subcommand
20687 Linus Torvalds (2):
20688 Make thin-pack generation subproject aware.
20689 Take binary diffs into account for "git rebase"
20691 Lukas Sandström (1):
20692 Add the word reflog to Documentation/config.txt:core.logAllRefUpdates
20695 git-completion.bash - add support for git-bundle
20698 Add and document a global --no-pager option for git.
20701 Clarify commit-tree documentation
20704 pack-objects: remove bogus arguments to delta_cacheable()
20706 Paul Mackerras (3):
20707 gitk: Fix warning when removing a branch
20708 gitk: Fix bug in fix for warning when removing a branch
20709 gitk: Add a window to list branches, tags and other references
20712 path-list.c: always free strdup'ed paths
20714 Salikh Zakirov (1):
20715 git-add -u paths... now works from subdirectory
20717 Sean Estabrooks (1):
20718 Fix small typo in git send-email man page.
20720 Shawn O. Pearce (11):
20721 git-gui: Avoid Tcl error in popup menu on diff viewer
20722 Actually allow TAG_FIXUP branches in fast-import
20723 Use handy ALLOC_GROW macro in fast-import when possible
20724 Teach fast-import to ignore lines starting with '#'
20725 Make trailing LF following fast-import `data` commands optional
20726 Make trailing LF optional for all fast-import commands
20727 Allow frontends to bidirectionally communicate with fast-import
20728 Generate crash reports on die in fast-import
20729 Include recent command history in fast-import crash reports
20730 Correct documentation of 'reflog show' to explain it shows HEAD
20731 Don't allow combination of -g and --reverse as it doesn't work
20733 Steffen Prohaska (1):
20734 gitk: Let user easily specify lines of context in diff view
20737 Document what the stage numbers in the :$n:path syntax mean.
20739 Sven Verdoolaege (1):
20740 git-apply: apply submodule changes
20743 git-gui: Added support for OS X right click
20746 Version v1.5.3-rc5; changes since v1.5.3-rc4:
20747 ---------------------------------------------
20750 Documentation/git-svn: how to clone a git-svn-created repository
20752 Alberto Bertogli (1):
20753 Allow git-svnimport to take "" as the trunk directory.
20756 Fix filehandle leak in "git branch -D"
20757 gitk: Continue and show error message in new repos
20758 gitk: Show an error and exit if no .git could be found
20760 Alexandre Julliard (3):
20761 git.el: Add support for interactive diffs.
20762 git.el: Always set the current directory in the git-diff buffer.
20763 git-add: Add support for --refresh option.
20766 cvsserver: Fix for work trees
20767 Add read_cache to builtin-check-attr
20769 Brian Gernhardt (1):
20770 Fix t5701-clone-local for white space from wc
20773 Make git tag a builtin.
20774 builtin-tag.c: Fix two memory leaks and minor notation changes.
20775 Make verify-tag a builtin.
20778 Documentation/git-commit.txt: correct bad list formatting.
20779 Add support for an info version of the user manual
20780 INSTALL: explain info installation and dependencies.
20781 Documentation/Makefile: remove cmd-list.made before redirecting to it.
20782 git-sh-setup.sh: make GIT_DIR absolute
20783 Add a test for git-commit being confused by relative GIT_DIR
20786 git-am: initialize variable $resume on startup
20788 J. Bruce Fields (4):
20789 user-manual: update for new default --track behavior
20790 user-manual: mention git-gui
20791 documentation: use the word "index" in the git-add manual page
20792 documentation: use the word "index" in the git-commit man page
20794 Jakub Narebski (1):
20795 gitweb: Fix handling of $file_name in feed generation
20797 Johannes Schindelin (4):
20798 launch_editor(): Heed GIT_EDITOR and core.editor settings
20799 Teach "git stripspace" the --strip-comments option
20800 checkout-index needs a working tree
20801 Reinstate the old behaviour when GIT_DIR is set and GIT_WORK_TREE is unset
20803 Junio C Hamano (24):
20804 git-clone: aggressively optimize local clone behaviour.
20805 git-completion: add "git stash"
20806 INSTALL: add warning on docbook-xsl 1.72 and 1.73
20807 unpack-trees.c: assume submodules are clean during check-out
20808 Fix install-doc-quick target
20809 user-manual: mention git stash
20810 setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
20811 pager: find out pager setting from configuration
20812 Fix "make GZ=1 quick-install-doc"
20813 Reorder the list of commands in the manual.
20814 Fix formatting of git-blame documentation.
20815 Fix an illustration in git-rev-parse.txt
20816 tweak manpage formatting
20817 Revert "tweak manpage formatting"
20818 Optimize "diff --cached" performance.
20819 allow git-bundle to create bottomless bundle
20820 allow git-bundle to create bottomless bundle
20821 t3404: fix "fake-editor"
20822 builtin-bundle create - use lock_file
20823 git-diff: squelch "empty" diffs
20824 merge-recursive: do not rudely die on binary merge
20825 attr.c: refactoring
20826 attr.c: read .gitattributes from index as well.
20829 Jyotirmoy Bhattacharya (1):
20830 Fixed git-push manpage
20832 Linus Torvalds (8):
20833 connect: accept file:// URL scheme
20834 apply: remove directory that becomes empty by renaming the last file away
20835 Start moving unpack-trees to "struct tree_desc"
20836 Fix "git commit directory/" performance anomaly
20837 Move old index entry removal from "unpack_trees()" into the individual functions
20838 Optimize the common cases of git-read-tree
20839 Optimize the two-way merge of git-read-tree too
20840 Optimize the three-way merge of git-read-tree
20842 Luiz Fernando N. Capitulino (3):
20843 Avoid ambiguous error message if pack.idx header is wrong
20844 Introduces xmkstemp()
20845 Use xmkstemp() instead of mkstemp()
20847 Marco Costalba (1):
20848 Add --log-size to git log to print message size
20851 builtin-bundle.c - use stream buffered input for rev-list
20852 builtin-bundle - use buffered reads for bundle header
20853 gitk: Enable selected patch text on Windows
20854 gitk: Handle MouseWheel events on Windows
20855 t3902 - skip test if file system doesn't support HT in names
20857 Paul Mackerras (4):
20858 gitk: Add a context menu for file list entries
20859 gitk: Fix bug causing the "can't unset idinlist(...)" error
20860 gitk: Fix bug introduced in commit 67a4f1a7
20861 gitk: Fix bug causing Tcl error when updating graph
20863 Randal L. Schwartz (1):
20864 add "test-absolute-path" to .gitignore
20867 git-p4: Fix the sorting of changelists when cloning a Perforce repository.
20870 diff: don't run pager if user asked for a diff style exit code
20871 diff: squelch empty diffs even more
20873 Shawn O. Pearce (4):
20874 Document GIT_SSH environment variable alongside other variables
20875 Teach update-paranoid how to store ACLs organized by groups
20876 Teach the update-paranoid to look at file differences
20877 Use the empty tree for base diff in paranoid-update on new branches
20879 Simon Hausmann (2):
20880 git-p4: Fix support for symlinks.
20881 git-p4: Fix git-p4 submit to include only changed files in the perforce submit template.
20883 Steffen Prohaska (1):
20884 Improved hint on how to set identity
20887 git-stash documentation: stash numbering starts at zero, not one
20888 git-stash documentation: add missing backtick
20891 Add a note about the index being updated by git-status in some cases
20893 Uwe Kleine-König (3):
20894 send-email: teach sanitize_address to do rfc2047 quoting
20895 send-email: rfc822 forbids using <address@domain> without a non-empty "phrase"
20896 send-email: get all the quoting of realnames right
20899 Version v1.5.3-rc4; changes since v1.5.3-rc3:
20900 ---------------------------------------------
20903 Add an option to specify a file to config builtin
20904 Add a test for git-config --file
20905 Make verse of git-config manpage more readable
20906 Hack git-add--interactive to make it work with ActiveState Perl
20908 Alexandre Julliard (2):
20909 git.el: Avoid using ewoc-set-data for compatibility with Emacs 21.
20910 git.el: Take into account the core.excludesfile config option.
20912 Bradford C. Smith (2):
20913 fully resolve symlinks when creating lockfiles
20914 use lockfile.c routines in git_commit_set_multivar()
20916 Brian Gernhardt (1):
20917 Document commit.template configuration variable.
20919 Christian Couder (1):
20920 rev-list --bisect: fix allocation of "int*" instead of "int".
20922 Christian Stimming (1):
20923 git-gui: Unify wording to say "to stage" instead of "to add"
20926 Makefile: use $(FIND) instead of find
20927 git-sh-setup.sh: make GIT_EDITOR/core.editor/VISUAL/EDITOR accept commands
20928 When generating manpages, delete outdated targets first.
20930 David Soria Parra (1):
20931 Documentation/gitattributes.txt: typofix
20934 Fix documentation for core.gitproxy to reflect code
20936 Han-Wen Nienhuys (2):
20937 Sort output of "p4 change" in incremental import before further
20938 Fix style nit in Python slicing.
20940 Jakub Narebski (3):
20941 gitweb: Show submodule entries in the 'tree' view
20942 gitweb: Simplify 'opt' parameter validation, add "no merges" feeds
20943 gitweb: Allow for multivalued parameters passed to href subroutine
20946 Documentation/git-diff: remove -r from --name-status example
20947 git-diff: turn on recursion by default
20950 --base-path-relaxed option
20952 Johannes Schindelin (11):
20953 rebase -i: fix overzealous output redirection
20954 rebase -i: fix interrupted squashing
20955 white space fixes in setup.c
20956 Add is_absolute_path() and make_absolute_path()
20957 Add functions get_relative_cwd() and is_inside_dir()
20958 Add set_git_dir() function
20959 Clean up work-tree handling
20960 get_relative_cwd(): clarify why it handles dir == NULL
20961 rebase -i: ignore patches that are already in the upstream
20962 rebase -i: fix for optional [branch] parameter
20963 read-tree: remove unnecessary call to setup_git_directory()
20965 Julian Phillips (1):
20966 git-gui: Handle git versions of the form n.n.n.GIT
20968 Junio C Hamano (23):
20969 Make sure git-stash works from subdirectory.
20970 gitweb: fix broken snapshot
20971 git-submodule module_name: avoid using unwieldy "value_regexp" feature.
20972 git-submodule: remove redundant call to git-describe
20973 When locking in a symlinked repository, try to lock the original.
20974 git_mkstemp(): be careful not to overflow the path buffer.
20975 Update description of -z option.
20976 git-stash: do not remove a ref by hand.
20977 Add test for symlinked configuration file updates.
20978 Fix git-stash apply --index
20979 git-stash apply --index: optimize postprocessing
20980 log_ref_write() -- do not chomp reflog message at the first LF
20981 symbolic-ref, update-ref: do not refuse reflog message with LF
20982 rebase: try not to munge commit log message
20983 add_file_to_index: skip rehashing if the cached stat already matches
20984 Unset GIT_EDITOR while running tests.
20985 git.c: execution path
20986 git-commit.sh: Permit the --amend message to be given with -m/-c/-C/-F.
20987 RelNotes 1.5.3 updates before -rc4
20988 Fix work-tree related breakages
20989 gitweb: do not choke on recursive symlink
20990 Fix bogus use of printf in t3700 test
20993 Kristian Høgsberg (1):
20994 Add test case for basic commit functionality.
20997 gitk: Ignore ctrl-z as EOF on windows
20999 Nanako Shiraishi (1):
21000 git-stash: Make sure reflog is created for refs/stash
21002 Nguyễn Thái Ngọc Duy (1):
21003 git-write-tree should not crash if prefix does not exist
21005 Paul Mackerras (4):
21006 gitk: Show changes in index and changes in working directory separately
21007 gitk: Make the fake commit for the index changes green rather than magenta
21008 gitk: Wait for the window to become visible after creating it
21009 gitk: Fix bugs in the Find function
21012 git-svn: Translate invalid characters in refname
21014 Robert Schiele (2):
21015 add option to find zlib in custom path
21016 make the name of the library directory a config option
21018 Robin Rosenberg (1):
21019 Document --unified/-U option
21022 Rename git-rebase interactive buffer: todo => git-rebase-todo
21024 Shawn O. Pearce (49):
21025 git-gui: Skip -dirty suffix on core git versions
21026 git-gui: Brown paper bag "dirty git version fix"
21027 git-gui: Always disable the Tcl EOF character when reading
21028 git-gui: Delay searching for 'nice' until its really asked for
21029 git-gui: Don't crash in ask_popup if we haven't mapped main window yet
21030 git-gui: Change our initial GC hint to be an estimate
21031 git-gui: Let the user continue even if we cannot understand git version
21032 git-gui: Delay the GC hint until after we are running
21033 git-gui: Move feature option selection before GIT_DIR init
21034 git-gui: Allow blame/browser subcommands on bare repositories
21035 git-gui: Allow browser subcommand to start in subdirectory
21036 git-gui: Allow users to browse any branch, not just the current one
21037 git-gui: Clarify the visualize history menu options
21038 git-gui: Increase the default height of the revision picker
21039 git-gui: Convert merge dialog to use class system
21040 Don't offer my special Tools/Migrate hack unless in multicommit
21041 git-gui: Bind Ctrl/Cmd-M to merge action
21042 git-gui: Avoid unnecessary global statements when possible
21043 git-gui: Translate standard encoding names to Tcl ones
21044 git-gui: Don't show blame tooltips that we have no data for
21045 git-gui: Completely remove support for creating octopus merges
21046 git-gui: Automatically backup the user's commit buffer
21047 git-gui: Save the merge base during checkout_op processing
21048 git-gui: Factor out common fast-forward merge case
21049 git-gui: Simplify error case for unsupported merge types
21050 git-gui: Skip unnecessary read-tree work during checkout
21051 git-gui: Internally allow fetch without storing for future pull support
21052 git-gui: Completely remove my Tools/Migrate hack
21053 git-gui: Fix unnecessary fast-forward during checkout
21054 gitk: Bind keyboard actions to the command key on Mac OS
21055 git-gui: Clarify meaning of add tracked menu option
21056 git-gui: Paper bag fix quitting crash after commit
21057 git-gui: Refactor diff popup into a procedure to ease i18n work
21058 git-gui: Refactor current branch menu items to make i18n easier
21059 git-gui: Avoid unnecessary symbolic-ref call during checkout
21060 git-gui: Save remote urls obtained from config/remotes setup
21061 git-gui: Display commit/tag/remote info in tooltip of revision picker
21062 git-gui: Show ref last update times in revision chooser tooltips
21063 git-gui: Replace merge dialog with our revision picker widget
21064 git-gui: Cleanup bindings within merge dialog
21065 git-gui: Format tracking branch merges as though they were pulls
21066 git-gui: Remove usernames from absolute SSH urls during merging
21067 git-gui: Don't kill modified commit message buffer with merge templates
21068 git-gui: Honor core.excludesfile when listing extra files
21069 git-gui: Use progress bar while resetting/aborting files
21070 git-gui: Make sure remotes are loaded when picking revisions
21071 git-gui: Don't offer to stage hunks from untracked files
21072 git-gui: Use more modern looking icons in the tree browser
21073 git-gui: Minor refactoring of merge command line in merge support
21075 Simon Hausmann (1):
21076 git-p4: Fix p4 user cache population on Windows.
21079 Try to be consistent with capitalization in the documentation
21081 Thomas Schwinge (2):
21082 Don't rely on unspecified behavior
21083 Support building on GNU/Hurd
21086 Version v1.5.3-rc3; changes since v1.5.3-rc2:
21087 ---------------------------------------------
21090 Add GIT_EDITOR environment and core.editor configuration variables
21092 Alexandre Julliard (2):
21093 git.el: Support for incremental status updates.
21094 git.el: Pass an explicit argument to enable smerge-mode.
21097 Rename read_pipe() with read_fd() and make its buffer nul-terminated.
21100 contrib/emacs/Makefile: Also install .el files.
21101 Documentation/gitignore.txt: Fix the seriously misleading priority explanation
21104 git-svn: fix commiting renames over DAV with funky file names
21106 Francis Moreau (1):
21107 Fix git-branch documentation when using remote refs
21109 Jakub Narebski (3):
21110 gitweb cleanup: Move @diff_opts declaration earlier
21111 gitweb: Fix support for legacy gitweb config for snapshots
21112 gitweb: More detailed error messages for snapshot format
21115 pretty-options.txt: tiny doc fix
21117 Johannes Schindelin (11):
21118 filter-branch: get rid of "set -e"
21119 rebase -i: call editor just once for a multi-squash
21120 fsck --lost-found: write blob's contents, not their SHA-1
21121 mailinfo: fix 'fatal: cannot convert from utf-8 to utf-8'
21122 Shut "git rebase -i" up when no --verbose was given
21123 rebase -i: exchange all "if [ .. ]" by "if test .."
21124 filter-branch: Big syntax change; support rewriting multiple refs
21125 Teach revision machinery about --no-walk
21126 git log -g: Complain, but do not fail, when no reflogs are there
21127 Teach approxidate() to understand "never"
21128 git am: skip pine's internal folder data
21130 Julian Phillips (1):
21131 Force listingblocks to be monospaced in manpages
21133 Junio C Hamano (8):
21135 Do not expect unlink(2) to fail on a directory.
21136 Fix VISUAL/EDITOR preference order in Documentation/config.txt.
21137 Synonyms: -i == --regexp-ignore-case, -E == --extended-regexp
21138 Mark user-manual as UTF-8
21139 user-manual: fix typolets.
21140 t9200: Be careful when checking CVS/Entries
21144 send-email: Update regex parsing for pine aliases
21146 Linus Torvalds (2):
21147 Do a better job at guessing unknown character sets
21148 Fix up duplicate parents removal
21150 Marco Costalba (1):
21151 Avoid to duplicate commit message when is not encoded
21153 Matt McCutchen (1):
21154 gitweb: snapshot cleanups & support for offering multiple formats
21156 Nanako Shiraishi (1):
21157 Document "git stash message..."
21160 filter-branch: fix dash complaining about "Missing '))'"
21161 cleanup unpack-trees.c: shrink struct tree_entry_list
21164 git-svn: Minimalistic patch which allows svn usernames with space(s).
21166 Robin Rosenberg (1):
21167 cvsexportcommit: avoid racy CVS problem.
21170 git-p4: use subprocess in p4CmdList
21171 git-p4: input to "p4 files" by stdin instead of arguments
21173 Simon Hausmann (3):
21174 git-p4: Cleanup, make listExistingP4Branches a global function for later use.
21175 git-p4: Fix upstream branch detection for submit/rebase with multiple branches.
21176 git-p4: Cleanup, used common function for listing imported p4 branches
21179 Document how to tell git to not launch a pager
21180 Teach git-commit about commit message templates.
21182 Sven Verdoolaege (1):
21183 unpack-trees.c: assume submodules are clean during check-out
21186 Version v1.5.3-rc2; changes since v1.5.3-rc1:
21187 ---------------------------------------------
21190 Fix git-rebase -i to allow squashing of fast-forwardable commits
21193 Use $(RM) in Makefiles instead of 'rm -f'
21196 git-svn: remove leading slashes from fetch lines in the generate config
21199 make git-send-email.perl handle email addresses with no names when Email::Valid is present
21201 Jakub Narebski (3):
21202 Update git-merge documentation.
21203 Document long options '--message=<msg>' and '--no-commit'
21204 Document git commit --untracked-files and --verbose
21207 git-cvsserver: detect/diagnose write failure, etc.
21210 Remove useless uses of cat, and replace with filename arguments
21212 Junio C Hamano (7):
21213 Make show_rfc2822_date() just another date output format.
21214 Wire new date formats to --date=<format> parser.
21215 Document new --date=<format>
21216 Add contrib/stats/mailmap.pl script
21218 Documentation/git-commit-tree: remove description of a nonexistent limitation
21221 Marius Storm-Olsen (1):
21222 Fix git-p4 on Windows to not use the Posix sysconf function.
21225 More permissive "git-rm --cached" behavior without -f.
21228 Pack-objects: properly initialize the depth value
21230 Paul Mackerras (1):
21231 gitk: Fix bug introduced by previous commit
21233 Peter Hagervall (1):
21234 Make every builtin-*.c file #include "builtin.h"
21236 Robin Rosenberg (1):
21237 Support output ISO 8601 format dates
21239 Sean Estabrooks (3):
21240 Remove "WITH_P4IMPORT" knob from the Makefile
21241 Remove p4 rpm from git.spec.in.
21242 Demote git-p4import to contrib status.
21244 Shawn O. Pearce (2):
21245 Correct trivial typo in fast-import documentation
21246 Teach fast-import to recursively copy files/directories
21248 Stephen Rothwell (1):
21249 send-email: discard blank around address in extract_valid_address as well.
21251 Sven Verdoolaege (1):
21252 lockfile.c: schedule remove_lock_file only once.
21255 Version v1.5.3-rc1; changes since v1.5.3-rc0:
21256 ---------------------------------------------
21259 fix remote.origin.url in tutorial.txt
21262 Handle missing prefix for "Subject:" as if no prefix given
21263 Handle format.subjectprefix for every command which accepts --pretty
21264 Fix t5516 to create test repo without hooks
21265 Add -v|--verbose to git remote to show remote url
21268 Remove USE_PAGER from git-pickaxe and git-annotate
21269 Add urls.txt to git-clone man page
21272 user-manual: grammar and style fixes
21274 Brian Downing (10):
21275 pack-objects: Prefer shallower deltas if the size is equal
21276 gitk: Fix for tree view ending in nested directories
21277 Pack information tool
21278 Correct shebang line for contrib/stats/packinfo.pl
21279 Don't try to delta if target is much smaller than source
21280 Support fetching the memory usage of a delta index
21281 Add functions for parsing integers with size suffixes
21282 Add pack-objects window memory usage limit
21283 Add --window-memory option to git-repack
21284 Add documentation for --window-memory, pack.windowMemory
21286 Brian Gernhardt (1):
21287 Add core.pager config variable.
21289 CJ van den Berg (1):
21290 git-submodule: Fix two instances of the same typo
21293 t7004: Skip tests for signed tags in an old version of gpg.
21294 t0030: Remove repeated instructions and add missing &&
21295 t0030: Add tests with consecutive text lines and others with spaces added.
21296 t7004: Add tests for the git tag -n option.
21297 Function stripspace now gets a buffer instead file descriptors.
21299 Daniel Barkalow (2):
21300 Add allocation and freeing functions for struct refs
21301 Some cosmetic changes to remote library
21304 Add missing functions to contrib/emacs/vc-git.el
21307 git-svn: fix blocking with svn:// servers after do_switch
21309 Frank Lichtenheld (1):
21310 cvsserver: always initialize state in argsplit()
21313 git-gui: properly popup error if gitk should be started but is not installed
21314 git-commit: don't add multiple Signed-off-by: from the same identity
21316 J. Bruce Fields (2):
21318 user-manual: more explanation of push and pull usage
21321 stash: allow running from a subdirectory
21324 Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long
21326 Johannes Schindelin (24):
21327 diff --no-index: fix --name-status with added files
21328 glossary: add 'reflog'
21329 Document git-filter-branch
21330 Add diff-option --ext-diff
21331 filter-branch: add a test for the commit removal example
21332 filter-branch: make output nicer
21333 filter-branch: a few more touch ups to the man page
21334 filter-branch documentation: clarify which filters are eval'ed
21335 filter-branch: fail gracefully when a filter fails
21336 Future-proof source for changes in xdemitconf_t
21337 Teach git-stash to "apply --index"
21338 Enable "git rerere" by the config variable rerere.enabled
21339 git-branch: default to --track
21340 Fix "apply --reverse" with regard to whitespace
21341 branch.autosetupmerge: allow boolean values, or "all"
21342 rebase -i: handle --continue more like non-interactive rebase
21343 rebase -i: actually show the diffstat when being verbose
21344 rebase -i: remember the settings of -v, -s and -p when interrupted
21345 rebase -i: put a nice warning into the todo list
21346 rerere: record resolution even if file is not in merge base
21347 Fix core.sharedRepository = 2
21348 Fix --cherry-pick with given paths
21349 Add for_each_remote() function, and extend remote_find_tracking()
21350 branch --track: code cleanup and saner handling of local branches
21353 filter-branch: Avoid an error message in the map function.
21354 filter-branch documentation: some more touch-ups.
21355 Allow rebase to run if upstream is completely merged
21358 fsck --lost-found writes to subdirectories in .git/lost-found/
21360 Junio C Hamano (22):
21361 Update draft Release Notes for 1.5.3
21362 Update reflog message created for stashes
21363 Do not check if getcwd() result begins with a slash.
21364 Fix git-stash(1) markup.
21365 git-stash: allow more descriptive reminder message when saving
21366 Introduce diff_filespec_is_binary()
21367 Per-path attribute based hunk header selection.
21368 Fix configuration syntax to specify customized hunk header patterns.
21369 diff: honor binariness specified in attributes
21370 gitweb: make repeated calls to git_get_project_owner() bearable
21371 diff.c: make built-in hunk header pattern a separate table
21372 git-gui: use "blame -w -C -C" for "where did it come from, originally?"
21373 git-stash: try reusing cached stat info as much as possible
21374 Fix merge-one-file for our-side-added/our-side-removed cases
21375 Document custom hunk header selection
21376 revision.c: remove duplicated parents after history simplification
21377 Revert 88494423 (removal of duplicate parents in the output codepath)
21378 Re-code builtin-branch.c in UTF-8
21379 Teach read-tree 2-way merge to ignore intermediate symlinks
21381 Update list of older git docs
21385 git-submodule(1): update description and key names
21387 Marcus Fritzsch (1):
21388 Fixed a formulation mistake in Documentation/user-manual.txt
21391 Prefer EMAIL to username@hostname.
21392 Change "added.moved or removed" to "added, moved or removed" in
21393 Add [verse] to the SYNOPSIS section of git-submodule.txt.
21395 Matt McCutchen (3):
21396 gitweb: make search form generate pathinfo-style URLs
21397 gitweb: make "No commits" in project list gray, not bold green
21398 Makefile: rebuild git.o on version change, clean up git$X flags
21400 Matthias Lederhofer (3):
21401 git-init: set core.worktree if GIT_WORK_TREE is specified
21402 git-clone: split up long &&-command-chain and use a function for cleanup
21403 make git-clone GIT_WORK_TREE aware
21405 Michael Hendricks (2):
21406 git-send-email: allow an email alias for --from
21407 gitweb: configurable width for the projects list Description column
21410 Document -<n> for git-format-patch
21411 gitweb: prefer git_get_project_owner() over get_file_owner()
21412 gitweb: new cgi parameter: opt
21415 apply delta depth bias to already deltified objects
21416 script to display a distribution of longest common hash prefixes
21417 reduce git-pack-objects memory usage a little more
21419 Paul Mackerras (6):
21420 gitk: Fix the find and highlight functions
21421 gitk: Fix bug in the anc_or_desc routine
21422 gitk: Remove the unused stopfindproc function
21423 gitk: Fix bug causing "can't read commitrow(0,n)" error
21424 gitk: Use git log and add support for --left-right
21425 gitk: Improve handling of -- and ambiguous arguments
21428 diff-lib.c: don't strdup twice
21430 Sean Estabrooks (1):
21431 Alter git-checkout reflog message to include "from" branch
21433 Shawn O. Pearce (46):
21434 git-gui: Unlock the index when cancelling merge dialog
21435 git-gui: Start blame windows as tall as possible
21436 git-gui: Correct resizing of remote branch delete dialog
21437 git-gui: Don't bind F5/M1-R in all windows
21438 git-gui: Bind M1-P to push action
21439 git-gui: Include a Push action on the left toolbar
21440 git-gui: Ensure windows shortcuts always have .bat extension
21441 git-gui: Honor rerere.enabled configuration option
21442 git-gui: New Git version check support routine
21443 git-gui: Skip nicknames when selecting author initials
21444 git-gui: Teach class system to support [$this cmd] syntax
21445 git-gui: Abstract the revision picker into a mega widget
21446 git-gui: Refactor the delete branch dialog to use class system
21447 git-gui: Optimize for newstyle refs/remotes layout
21448 git-gui: Maintain remote and source ref for tracking branches
21449 git-gui: Allow users to match remote branch names locally
21450 git-gui: Fast-forward existing branch in branch create dialog
21451 git-gui: Enhance choose_rev to handle hundreds of branches
21452 git-gui: Sort tags descending by tagger date
21453 git-gui: Option to default new branches to match tracking branches
21454 git-gui: Automatically refresh tracking branches when needed
21455 git-gui: Better handling of detached HEAD
21456 git-gui: Refactor our ui_status_value update technique
21457 git-gui: Refactor branch switch to support detached head
21458 git-gui: Unabbreviate commit SHA-1s prior to display
21459 git-gui: Default selection to first matching ref
21460 git-gui: Allow double-click in checkout dialog to start checkout
21461 git-gui: Extract blame viewer status bar into mega-widget
21462 git-gui: Change the main window progress bar to use status_bar
21463 git-gui: Show a progress meter for checking out files
21464 git-gui: Always use absolute path to all git executables
21465 git-gui: Correct gitk installation location
21466 git-gui: Assume unfound commands are known by git wrapper
21467 git-gui: Treat `git version` as `git --version`
21468 git-gui: Perform our own magic shbang detection on Windows
21469 git-gui: Teach console widget to use git_read
21470 git-gui: Improve the Windows and Mac OS X shortcut creators
21471 git-gui: Correct ls-tree buffering problem in browser
21472 git-gui: Don't linewrap within console windows
21473 git-gui: Paper bag fix for Cygwin shortcut creation
21474 git-gui: Use sh.exe in Cygwin shortcuts
21475 git-gui: Include a space in Cygwin shortcut command lines
21476 Clarify documentation of fast-import's D subcommand
21477 Support wholesale directory renames in fast-import
21478 git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}
21479 git-gui: Change prior tree SHA-1 verification to use git_read
21481 Steffen Prohaska (1):
21482 filter-branch: added missing warn function
21485 Documentation for git-log --follow
21487 Uwe Kleine-König (2):
21488 stash: end commit log with a newline
21489 repack: don't report "Nothing new to pack." if -q is given
21491 William Pursell (1):
21492 user-manual: fix directory name in git-archive example
21495 Version v1.5.3-rc0; changes since v1.5.2.5:
21496 -------------------------------------------
21499 git-send-email: Add --threaded option
21500 git-send-email: make options easier to configure.
21501 format-patch: Add format.subjectprefix config option
21504 Fix the progress code to output LF only when it is really needed
21505 Add run_command_v_opt_cd: chdir into a directory before exec
21506 Add ability to specify environment extension to run_command
21507 Allow environment variables to be unset in the processes started by run_command
21508 Verbose connect messages to show the IP addresses used
21509 Add another verbosity level to git-fetch
21510 Add a configuration option to control diffstat after merge
21511 Fix push with refspecs containing wildcards
21512 Do not use h_errno after connect(2): the function does not set it
21513 cvsserver: Actually implement --export-all
21514 Avoid perl in t1300-repo-config
21516 Alexandre Julliard (1):
21517 pack-check: Sort entries by pack offset before unpacking them.
21519 Alexandre Vassalotti (1):
21520 git-tag: Fix "can't shift that many".
21522 Andy Whitcroft (3):
21523 cvsimport: add support for new style remote layout
21524 cvsimport: update documentation to include separate remotes option
21525 cvsimport: add <remote>/HEAD reference in separate remotes more
21527 Aneesh Kumar K.V (2):
21528 gitview: Fix the blame interface.
21529 gitview: run blame with -C -C
21531 Benjamin Sergeant (1):
21532 git-p4 fails when cloning a p4 depo.
21534 Brian Gernhardt (1):
21535 Fix t5516-fetch for systems where `wc -l` outputs whitespace.
21538 Fix git-stripspace to process correctly long lines and spaces.
21539 Add test script for git-stripspace.
21540 Add test-script for git-tag
21543 git-mergetool: Allow gvimdiff to be used as a mergetool
21546 Custom compression levels for objects and packs
21547 Alter sha1close() 3rd argument to request flush only
21548 git-repack --max-pack-size: new file statics and code restructuring
21549 git-repack --max-pack-size: write_{object,one}() respect pack limit
21550 git-repack --max-pack-size: split packs as asked by write_{object,one}()
21551 git-repack --max-pack-size: add option parsing to enable feature
21552 pack-objects: clarification & option checks for --max-pack-size
21553 Ensure git-repack -a -d --max-pack-size=N deletes correct packs
21555 Daniel Barkalow (6):
21556 Move remote parsing into a library file out of builtin-push.
21557 Move refspec parser from connect.c and cache.h to remote.{c,h}
21558 Add handlers for fetch-side configuration of remotes.
21559 Update local tracking refs when pushing
21560 Move refspec pattern matching to match_refs().
21561 Fix pushing to a pattern with no dst
21564 Generate tags with correct timestamp (git-svnimport)
21566 Elvis Pranskevichus (1):
21567 Use git-tag in git-cvsimport
21570 git-submodule: Instead of using only annotated tags, use any tags.
21573 git-svn: cleanup: factor out longest_common_path() function
21574 git-svn: test for creating new directories over svn://
21575 git-svn: reduce stat() calls for a backwards compatibility check
21576 git-svn: allow dcommit to retain local merge information
21578 Fernando J. Pereda (1):
21579 Teach mailsplit about Maildir's
21581 Frank Lichtenheld (11):
21582 t9400: Add test cases for config file handling
21583 t9400: Add some more cvs update tests
21584 t9400: Add some basic pserver tests
21585 t9400: Work around CVS' deficiencies
21586 cvsserver: Handle 'cvs login'
21587 cvsserver: Make req_Root more critical of its input data
21588 cvsserver: Add some useful commandline options
21589 cvsserver: Let --base-path and pserver get along just fine
21590 cvsserver: Actually implement --export-all
21591 config: Add --null/-z option for null-delimted output
21592 config: add support for --bool and --int while setting values
21595 Unify write_index_file functions
21598 git-branch: cleanup config file when deleting branches
21599 git-svn: trailing slash in prefix is mandatory with --branches/-b
21600 git-cvsimport: force checkout of working tree after initial import
21602 Han-Wen Nienhuys (28):
21604 reformatting: break long lines.
21605 rename apply() to applyCommit(); apply is a python builtin
21606 add .dotest to .gitignore
21607 Robustness fixes for pipes
21610 clone and sync --keep-path to keep perforce path to module.
21611 use string.strip() iso. slicing.
21612 use strip() iso. slicing for removing \n
21613 add --verbose to all commands.
21614 Extract multiple paths concurrently.
21616 remove global .gitdir
21617 Read p4 files in one batch.
21618 Thinko, fix buglet.
21619 store p4 user cache in home directory.
21621 read files before creating the commit.
21622 don't p4 print deleted files.
21623 only run p4 print if necessary
21624 use p4CmdList() to get file contents in Python dicts. This is more robust.
21625 Cleanups & import into p4/master for local import
21627 thinko: really ignore deleted files.
21628 look for 'text' and 'binary' files.
21629 print error message when p4 print fails (eg. due to permission problems)
21630 also strip p4/ from local imports.
21632 Jakub Narebski (16):
21633 gitweb: Add test t9500 for gitweb (as standalone script)
21634 Add an option to git-ls-tree to display also the size of blob
21635 gitweb: Provide links to commitdiff to each parent in 'commitdiff' view
21636 gitweb: Improve "next" link in commitdiff view
21637 gitweb: Split git_patchset_body into separate subroutines
21638 gitweb: Create special from-file/to-file header for combined diff
21639 gitweb: Add links to blobdiffs in from-file/to-file header for merges
21640 gitweb: '--cc' for merges in 'commitdiff' view
21641 Document git rev-list --full-history
21642 Document git read-tree --trivial
21643 Document git rev-parse --is-inside-git-dir
21644 Document git reflog --stale-fix
21645 Document git rev-list --timestamp
21646 Use tabs for indenting definition list for options in git-log.txt
21647 Document git log --abbrev-commit, as a kind of pretty option
21648 Document git log --full-diff
21651 Add colour support in rebase and merge tree diff stats output.
21652 rev-parse: Identify short sha1 sums correctly.
21655 cmd_log_init: remove parsing of --encoding command line parameter
21656 refactor dir_add_name
21657 dir_struct: add collect_ignored option
21658 builtin-add: simplify (and increase accuracy of) exclude handling
21659 Fix ALLOC_GROW off-by-one
21660 Fix ALLOC_GROW calls with obsolete semantics
21661 git-stash: fix "no arguments" case in documentation
21662 git-stash: fix "can't shift that many" with no arguments
21663 git-stash: don't complain when listing in a repo with no stash
21664 Documentation: quote {non-attributes} for asciidoc
21665 Documentation: quote {non-attributes} for asciidoc
21666 Documentation: minor cleanups to branch/checkout wording
21668 Jeffrey C. Ollie (2):
21669 Add an option to quiet git-init.
21670 Quiet the output from git-init when cloning, if requested.
21673 Don't dereference a strdup-returned NULL
21674 detect close failure on just-written file handles
21675 Don't ignore a pack-refs write failure
21676 git-log: detect dup and fdopen failure
21679 Remove unnecessary code and comments on non-existing 8kB tag object restriction
21681 Johannes Schindelin (23):
21682 Update to SubmittingPatches
21683 Add git-filter-branch
21684 git-fsck: learn about --verbose
21685 Move buffer_is_binary() to xdiff-interface.h
21686 merge-recursive: refuse to merge binary files
21687 git-merge-file: refuse to merge binary files
21688 filter-branch: use $(($i+1)) instead of $((i+1))
21689 filter-branch: fix behaviour of '-k'
21690 t5000: skip ZIP tests if unzip was not found
21691 Teach filter-branch about subdirectory filtering
21692 Teach diff to imply --find-copies-harder upon -C -C
21693 pp_header(): work around possible memory corruption
21694 diffcore-rename: favour identical basenames
21695 filter-branch: add example to move everything into a subdirectory
21696 Move the pick_author code to git-sh-setup
21697 Teach rebase an interactive mode
21698 rebase -i: several cleanups
21699 rebase -i: provide reasonable reflog for the rebased branch
21700 Teach rebase -i about --preserve-merges
21701 t7004: ship trustdb to avoid gpg warnings
21702 git add: respect core.filemode with unmerged entries
21703 Make '!' aliases more useful
21704 git-fsck: add --lost-found option
21707 filter-branch: Use rev-list arguments to specify revision ranges.
21708 filter-branch: also don't fail in map() if a commit cannot be mapped
21709 Makefile: Remove git-merge-base from PROGRAMS.
21710 filter-branch: Simplify parent computation.
21711 filter-branch: subdirectory filter needs --full-history
21712 Avoid double-slash in path names that depend on $(sharedir).
21713 Remove trailing slash from $(template_dir).
21714 git-remote show: Also shorten non-fast-forward refs in the 'push' listing
21715 Test 'git add' for unmerged entries when core.symlinks=false.
21718 Add the --numbered-files option to git-format-patch.
21721 Fix git-am(1) synopsis formatting
21722 git-rebase: suggest to use git-add instead of git-update-index
21725 Fix typo in git-mergetool
21727 Julian Phillips (2):
21728 Makefile: Use generic rule to build test programs
21729 new-workdir: handle rev-parse --git-dir not always giving full path
21731 Junio C Hamano (48):
21732 git-apply: Fix removal of new trailing blank lines.
21733 pack-objects: pass fullname down to add_object_entry()
21734 Teach "delta" attribute to pack-objects.
21735 builtin-pack-objects: remove unnecessary code for no-delta
21736 Fix command line parameter parser of revert/cherry-pick
21737 Remove git-applypatch
21738 mailsplit: fix for more than one input files
21739 Add DLH to .mailmap
21740 Release Notes: start preparing for 1.5.3
21741 git-apply: what is detected and fixed is not just trailing spaces.
21742 t7003: make test repeatable
21743 git-branch --track: fix tracking branch computation.
21745 Test wildcard push/fetch
21746 More missing static
21747 More missing static
21748 Even more missing static
21749 remote.c: refactor match_explicit_refs()
21750 remote.c: refactor creation of new dst ref
21751 remote.c: minor clean-up of match_explicit()
21752 remote.c: fix "git push" weak match disambiguation
21753 remote.c: "git-push frotz" should update what matches at the source.
21754 git-push: Update description of refspecs and add examples
21755 git-blame: do not indent with spaces.
21756 git-blame -w: ignore whitespace
21757 mktag: minimally update the description.
21758 Lift 16kB limit of log message output
21759 Extend --pretty=oneline to cover the first paragraph,
21760 Makefile: common-cmds.h depends on generate-cmdlist.sh script
21761 Makefile: allow generating git.o for debugging purposes
21762 -Wold-style-definition fix
21764 Documentation: update "stale" links for 1.5.2.2
21765 INSTALL: explain how to build documentation
21766 Two trivial -Wcast-qual fixes
21767 git-send-email: Do not make @-less message ID
21768 Add core.quotepath configuration variable.
21769 Update draft Release Notes for 1.5.3
21770 diffcore_count_changes: pass diffcore_filespec
21771 diffcore_filespec: add is_binary
21772 diffcore-delta.c: update the comment on the algorithm.
21773 diffcore-delta.c: Ignore CR in CRLF for text files
21774 git-stash: require "save" to be explicit and update documentation
21775 Update public documentation links for 1.5.2.3
21776 "git-push $URL" without refspecs pushes only matching branches
21777 Rewrite "git-frotz" to "git frotz"
21778 git-stash: make "save" the default action again.
21779 Mark disused commit walkers officially deprecated.
21782 git-p4: check for existence of repo dir before trying to create
21785 Add git-submodule command
21786 Add basic test-script for git-submodule
21787 git-submodule: move cloning into a separate function
21788 git-submodule: clone during update, not during init
21789 t7400: barf if git-submodule removes or replaces a file
21790 git-submodule: remember to checkout after clone
21791 Rename sections from "module" to "submodule" in .gitmodules
21792 git-submodule: give submodules proper names
21794 gitmodules(5): remove leading period from synopsis
21796 Linus Torvalds (9):
21797 Make "git gc" pack all refs by default
21798 Make the pack-refs interfaces usable from outside
21799 Makefile: add an explicit rule for building assembly output
21800 Finally implement "git log --follow"
21801 Fix up "git log --follow" a bit..
21802 Clean up internal command handling
21803 Check for IO errors after running a command
21804 git: Try a bit harder not to lose errno in stdio
21805 Start deprecating "git-command" in favor of "git command"
21807 Marco Costalba (1):
21808 Teach 'git-apply --whitespace=strip' to remove empty lines at the end of file
21810 Marius Storm-Olsen (7):
21811 Make the command call silent
21812 Replace \r\n with \n when importing from p4 on Windows
21813 Ensure that the commit message is Windows formated (CRLF) before invoking the editor.
21814 Fix git-p4 clone (defaultDestination)
21815 Fix single branch import into remotes
21816 Exclude the HEAD symbolic ref from the list of known branches
21817 Only use double quotes on Windows
21820 gitk: Make selection highlight color configurable
21821 gitk: Update fontsize in patch / tree list
21822 gitk: Allow specifying tabstop as other than default 8 characters.
21823 gitweb.perl - Optionally send archives as .zip files
21824 gitk: Use a spinbox for setting tabstop settings
21825 gitk: Update selection background colorbar in prefs dialog
21827 Martin Koegler (5):
21828 builtin-pack-objects: don't fail, if delta is not possible
21829 git-pack-objects: cache small deltas between big objects
21830 builtin-pack-object: cache small deltas
21831 diff-delta: use realloc instead of xrealloc
21832 gitweb: Handle non UTF-8 text better
21835 rename dirlink to gitlink.
21837 Matthias Lederhofer (18):
21838 add git-filter-branch to .gitignore
21839 make clean should remove all the test programs too
21840 filter-branch: prevent filters from reading from stdin
21841 chmod +x git-filter-branch.sh
21842 rev-parse: document --is-inside-git-dir
21843 rev-parse: introduce --is-bare-repository
21845 introduce GIT_WORK_TREE to specify the work tree
21846 Use new semantics of is_bare/inside_git_dir/inside_work_tree
21847 extend rev-parse test for --is-inside-work-tree
21849 setup_git_directory: fix segfault if repository is found in cwd
21850 filter-branch: always export GIT_DIR if it is set
21851 gitweb: change filename/directory name of snapshots
21852 make git barf when an alias changes environment variables
21853 make dist: include configure script in tarball
21854 ignore git-rebase--interactive
21855 getenv/setenv: use constants if available
21857 Matthijs Melchior (1):
21858 Teach git-tag about showing tag annotations.
21860 Michael Ellerman (2):
21861 gitview: Use new-style classes
21862 gitview: Define __slots__ for Commit
21864 Michael Krelin (1):
21865 git-svn: honor ~/.subversion/ client cert file settings.
21867 Michael S. Tsirkin (1):
21868 connect: display connection progress
21870 Nanako Shiraishi (3):
21871 Cloning from a repo without "current branch"
21872 Add git-stash script
21876 allow for undeltified objects not to be reused
21877 make "repack -f" imply "pack-objects --no-reuse-object"
21878 deprecate the new loose object header format
21879 fixes to output of git-verify-pack -v
21880 improve delta long block matching with big files
21881 update diff-delta.c copyright
21882 fix repack with --max-pack-size
21883 always start looking up objects in the last used pack first
21885 Paul Mackerras (18):
21886 gitk: Use the -q flag to git checkout
21887 gitk: New infrastructure for working out branches & previous/next tags
21888 gitk: Don't try to list large numbers of tags or heads in the details pane
21889 gitk: Add some more comments to the optimize_rows procedure
21890 gitk: Improve the behaviour of the initial selection
21891 gitk: Implement a simple scheduler for the compute-intensive stuff
21892 gitk: Cope with commit messages with carriage-returns and initial blank lines
21893 gitk: Disable the head context menu entries for the checked-out branch
21894 gitk: Store ids in rowrangelist and idrowranges rather than row numbers
21895 gitk: New algorithm for drawing the graph lines
21896 gitk: Show local uncommitted changes as a fake commit
21897 gitk: Speed up the reading of references
21898 gitk: Get rid of the childlist variable
21899 gitk: Add a "reset branch to here" row context-menu operation
21900 gitk: Limit how often we change the canvas scrolling region
21901 gitk: Fix bug causing nearby tags/heads to sometimes not be displayed
21902 gitk: Improve handling of whitespace and special chars in filenames
21903 gitk: Add a progress bar to show progress while resetting
21906 git-rev-list: Add regexp tuning options
21907 git-applymbox: Remove command
21909 Pierre Habouzit (3):
21910 $EMAIL is a last resort fallback, as it's system-wide.
21911 Active_nr is unsigned, hence can't be < 0
21915 git.spec: RPM failed, looking for wrong files.
21917 Randal L. Schwartz (1):
21918 Add test-sha1 to .gitignore.
21921 t5000: silence unzip availability check
21922 diffcore-rename: don't change similarity index based on basename equality
21923 diff: round down similarity index
21925 Robin Rosenberg (1):
21926 Add option to cvs update before export
21929 git-svn: avoid string eval for defining functions
21930 git-svn: use git-log rather than rev-list | xargs cat-file
21931 git-svn: cache max revision in rev_db databases
21933 Shawn O. Pearce (24):
21934 Teach git-describe how to run name-rev
21935 Lazily open pack index files on demand
21936 Micro-optimize prepare_alt_odb
21937 Attempt to delay prepare_alt_odb during get_sha1
21939 git-gui: GUI support for running 'git remote prune <name>'
21940 git-gui: Show the git-gui library path in 'About git-gui'
21941 git-gui: Enable verbose Tcl loading earlier
21942 git-gui: Provide fatal error if library is unavailable
21943 git-gui: Disable tearoff menus on Windows, Mac OS X
21944 git-gui: Allow users to rename branches through 'branch -m'
21945 git-gui: Allow users to delete remote branches
21946 git-gui: Expose the merge.diffstat configuration option
21947 Allow contrib new-workdir to link into bare repositories
21948 Test for recent rev-parse $abbrev_sha1 regression
21949 Simplify index access condition in count-objects, pack-redundant
21950 Ensure the pack index is opened before access
21951 Style nit - don't put space after function names
21952 git-gui: Internalize symbolic-ref HEAD reading logic
21953 git-gui: Quiet our installation process
21954 Avoid src:dst syntax as default bash completion for git push
21955 Document git-gui, git-citool as mainporcelain manual pages
21956 Teach bash how to complete +refspec on git-push
21957 Correct usages of sed in git-tag for Mac OS X
21959 Simon Hausmann (223):
21960 Initial import of a python script to import changesets from Perforce into git.
21961 Added basic support for specifying the depot path to import from as well as the range of perforce changes.
21962 Slightly improved help usage output and made specifying the trailing slash for the depot path optional.
21963 Implemented basic support for converting the date of the perforce change to the git format. The timezone isn't correctly set up yet though.
21964 Some fixes to the timezone conversion between the date of a perforce change and the git commit.
21965 Speed up the import of individual files from Perforce into git by passing the output of "p4 print" directly to git fast-import. Also try to set the mode of the file in git correctly based on file type heuristics.
21966 Removed unused p4cat function and added helper function for the perforce python interface (p4Cmd).
21967 Changed the import mechanism to write to git fast-import through a pipe instead of having p4-fast-export write to stdout and let the caller connect it to git fast-import.
21968 Minor code cleanups and ported some p4 interfacing code over to the p4 python mode.
21969 Instead of parsing the output of "p4 users" use the python objects of "p4 -G users".
21970 Ported the remaining functions that parsed p4 shell output over to the p4 python interface.
21971 Avoid calling fstat for every imported file (slow!) and instead read the file data first into the python process and use the length of the bytes read for the size field of git fast-import.
21972 Permit calling p4-fast-export with a depot path that has the typical ... wildcard at the end.
21973 Fixed displaying import progress by calling flush on stdout.
21974 Create a git tag for every changeset imported from perforce.
21975 Fix file permissions of p4-fast-export.py to be executable.
21976 Started working on incremental imports from Perforce.
21977 Simplify the incremental import by elimination the need for a temporary import branch.
21978 Code cleanups, move the code to create a commit with fast-import into a separate function out of the main loop.
21979 Initial support for importing a directory from Perforce at a specified revision.
21980 Minor cleanups and print an error message of git fast-import if it fails.
21981 Fixed incremental imports by using the correct "from" command instead of "merge" with git fast-import.
21982 Make incremental imports easier to use by storing the p4 depot path after an import in .git/config and re-using it when we're invoked again later.
21983 Make specifying the revision ranges more convenient.
21984 Fix calculation of the newest imported revision for #head imports.
21985 Catch io exceptions from git fast-import again and print the error message.
21986 Made the name of the git branch used for the perforce import configurable through a new --branch=<name> commandline option.
21987 Added a little helper script to debug the output of the p4 python interface.
21988 Minor code cleanups.
21989 Avoid the excessive use of git tags for every perforce change and instead just create one git tag for the last imported change.
21990 Changed the default git import branch from "p4" to "master".
21991 Added a little helper script to remove unused tags from the perforce import.
21992 Create lightweight git tags (using the "reset" trick) for the incremental import instead of full-blown ones. Also fix parsing the output of git name-rev for figuring out the last imported p4 change number.
21993 Cleanups, remove unused variable.
21995 Started work on p4 branch detection (experimental!).
21996 More fixes in heuristic p4 branch detection based on common path components.
21997 After marking a p4 branch as merged don't ever merge it in git again.
21998 Set git fast-import marks for every imported change for future use.
21999 When trying to map p4 integrations to git merges just record it as a single merge with the newest p4 change as secondary parent.
22000 Make it possible to specify the p4 changes to import through a text file (for debugging) and made various improvements to the branch/merge heuristic detection.
22001 Use sets.Set() instead of set() to run also with older versions of Python.
22002 Fix single-branch imports by skipping the branch/merge detection correctly.
22003 Added p4 delete behavioural emulation as todo item.
22004 Added support for --silent so that p4-fast-export can be called from cronjobs.
22005 More work in --silent support.
22006 Don't print a plain newline at the end of the execution (avoids bogus cron error mails).
22007 Adjust the output parsing of git name-rev to handle the output of the latest git version.
22008 Work in progress on detecting branches.
22009 Changed --known-branches to take a file as argument instead of a comma separated list.
22010 Fixed p4-debug file extension.
22011 Make the p4 data/command cache configurable through the --cache-debug commandline option.
22012 Minor code cleanups.
22013 More code cleanups and preparations for more branch detection heuristics.
22014 More work on branch detection by implementing changeIsBranchMerge().
22015 Reduce the number of false "merges" by skipping "branch from" entries in the integrated output as well as by ignoring integrations of future (newer) changes.
22016 Split up the cache commandline options into (command) cache and data cache.
22017 First version of a new script to submit changes back to perforce from git repositories.
22018 Fix git-dir option and allow reading log substitutions from a file
22019 Lots of bugfixes to p4-git-sync.
22020 Automatically operate on a temporary branch, needed for cherry-pick to work when applying changes to
22021 Be nice and use /usr/bin/env python for the git-p4 scripts
22022 Ignore Apple resource files when importing from perforce to git.
22023 Auto-detect the current git branch before submitting back to perforce.
22024 Use p4 revert ... instead of revert -a ... after submitting, to make sure the p4 checkout is clean.
22025 Default to interactive syncing
22026 Improved the git dir detection.
22027 Pass the right number of arguments to commit, fixes single-branch imports.
22028 Start moving the git-p4 tools into one single script.
22029 Provide a little bit of help description for the git-p4 "tools".
22030 First (untested) attempt at migrating p4-git-sync into the final git-p4 script
22031 Part of the code is copyright by Trolltech ASA.
22032 sync-to-perforce is now called submit and fixed the gitdir check a little bit
22033 Completely untested "merge" of p4-fast-export.py into git-p4.py
22034 Added missing "self"s to make the script evaluate correctly.
22035 Fixed the initial version import by getting the file index correct by correctly skipping deleted files.
22036 Removed p4-fast-export and p4-git-sync as they've been integrated into git-p4 now.
22037 Start of the git-p4 documentation.
22038 Documentation enhancements.
22039 Added experimental but super-fast --apply-as-patch option to git-p4 submit
22040 Fix support for deletions in git-p4 submit when using --apply-as-patch by filtering out deletions in the diff-tree output.
22041 Made --apply-as-patch the default for git-p4 submit as it's significantly faster.
22042 Make it possible to invoke git-p4 from within subdirectories of a git working tree.
22043 Don't show the submit template and the diff first in less but show it in $editor right away
22044 Removed the .py extension from git-p4 as it's annoying to type every time.
22045 Changed the format of the imported log message slightly, so that it's easier to parse again.
22046 Changed the default branch for imports from "master" to "p4"
22047 Added some helper function(s) to parse the depot path and change number from the log message
22048 Helper function to check the existance of a revision
22049 Set the default branch in run, not in the constructor
22050 Brand new smart incremental import that doesn't need tags or git repo-config :)
22051 Make it possible to run git-p4 submit from within the git repository
22052 Use the new incremental import style by default
22053 Different versions of p4 have different output for the where command ;(
22054 Minor cosmetic fixlet for the git-p4 submit sync question.
22055 Prefer git command over git-command.
22056 Don't try to parse any options with git-p4 debug but pass it straight on to p4
22057 git-p4 debug doesn't need a git repository
22058 Added support for mapping p4 labels to git tags
22059 Fix variable usage in tag import
22060 Fix the docs for git-p4 submit and turn git-p4 submit --master=foo into simply git-p4 submit mytopicbranch.
22061 Fix "compilation" :)
22062 Clean up python class names.
22063 Added git-p4 rebase convenience
22064 Provide a tree summary after git-p4 rebase
22065 Turn off potentially slow label detection by default
22066 Honor --silent for labels
22067 Added git-p4 clone convenience command
22068 Fix file determination for #head imports
22069 fix variable usage (oops)
22070 Added a simple example of usage to the "documentation" :)
22071 Allow for convenient rebasing after git-p4 submit
22072 Print an error message of some sort if git fast-import fails.
22073 Fix the timezone formatting. Now qgit also displays (parses) it correctly.
22074 Removed the old patch apply code from git-p4 submit.
22075 Slightly improved formatting of the raw_input questions.
22076 A new attempt at fixing the child-fast-import-process-not-finished race condition in the clone command
22077 Handle patch errors in git-p4 submit better.
22080 cleanup, renamed self.globalPrefix to self.depotPath
22081 Cleanup, removed the old tagging code
22082 Document some implementation details, for the curious... :)
22083 Use the subprocess module instead of popen2 to make it work on Windows.
22084 Added a little .bat wrapper from Marius
22085 Make sure all popen calls use binary mode (for Windows) and
22086 Make submitting work on Windows.
22087 Converted to unix newlines
22088 Fix git-p4 clone //depot/project (head import)
22089 Make git-p4 work with bare repositories.
22090 Added the possibility of skipping patches during git-p4 submit
22091 Give a better hint if git-p4 submit fails
22092 Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be in toplevel)
22093 A little todo note before I forget it :), based on a suggestion from Lars.
22094 Fixing syncing (gitdir discovery / cd) for bare repositories
22095 Always pass a sha1 for the initial parent so that git-fast-import doesn't think it's creating a new branch from itself. It's a sensible error in general but in the case of incremental imports we have to apply force :)
22096 Clean up code duplication for revision parsing and fix previous commit to not import into remotes/p4 (yet!).
22097 Removed cleantags command. It doesn't have any meaning anymore.
22098 Removed ancient and unused code to find the last imported revision from previous imports to use for the current import by looking at the p4 tags. The current approach of using the log message works better.
22099 Create the origin based import branch using git update-ref instead of git branch so that it's possible to have the import branch in refs/remotes.
22100 Changed the default p4 import branch to be refs/remotes/p4/{HEAD,master} instead of refs/heads/p4.
22101 Bite the bullet and automatically convert old style refs/heads/p4 repositories to the new style refs/remotes/p4 branching.
22102 Added support for git-p4 sync/rebase --with-origin. See git-p4.txt for details :)
22103 Removed todo item that is implemented :)
22104 Fix branch setup after initial clone.
22105 Removed unused cache variables.
22106 Started rewriting the branch detection, based on "p4 branches" and "p4 branch -o foo".
22107 Give branches a nice project prefix and don't bail out on clone if we failed to detect the master branch.
22108 More work on the incremental importing of multiple branches. Improved error detection by checking the exit code of git-fast-import.
22109 Cleanup/speed up the branch<> file split and removed change range limitation that I added for debugging (oops).
22110 More cleanups and speedups for labels and branches
22111 Removed unused variable, more cleanups
22112 Cache the output of "p4 users" for faster syncs on high latency links.
22113 Fix gitdir not being set when cloning. Needed for writing the p4 users cache.
22114 Oops, not only /set/ gitdir on clone, also set it /correctly/ :)
22115 Use git format-patch and git apply --apply when extracting patches from git and applying them to a Perforce checkout. This should make it possible to apply git commits with binary files that cannot be handled by path.
22116 Added support for git-p4 submit --direct (experimental)
22117 Specifying --detect-branches is now only needed for the initial clone/sync. Afterwards it's turned on implicitly if more p4 branches than remotes/p4/master are found.
22118 Had an idea for debugging, record it :)
22119 Another (potentially life-saving) idea for submit --direct
22120 Improved output for multi branch imports and noted another little todo item
22121 Fix conversion from old style heads/p4 to remotes/p4/master
22122 Fix error detection with git-p4 submit when the requested depot path is not in the client view.
22123 Fix git symbolic-ref warning on initial clone
22124 Detect with git-p4 submit --direct when there are no changes in the working directory
22125 Make git-p4 submit --direct safer by also creating a git commit
22126 Added a rollback command for debugging. It sets back the heads of the p4 branches to the specified p4 change number or earlier.
22127 Fix branch detection in multi-branch imports
22128 Fixes for rollback, delete branches that did not exist at the specified p4 change
22129 Added support for importing multiple branches into refs/heads instead of just refs/remotes using --import-local. Needs some further microfix but seems to work otherwise.
22130 Added support for --max-changes=<count> to ease import debugging
22131 Use refs/heads/* instead of refs/heads/p4/* for local imports
22133 Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash)
22134 Make rollback work with locally imported branches
22135 Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 command itself failed.
22136 Oops, fill the /list/ correct with the p4 exit code.
22137 Catch p4 errors in rollback early enough (before deleting refs!)
22138 Fix p4 execution in git-p4 rollback.
22139 Fix multi-branch import with --silent.
22140 Load the user map from p4 only once at run-time.
22141 Fix creating the remotes/p4 branches based on origin/* for the multi-branch import
22142 Forgot to remove this return statement from debugging
22143 Added support for --with-origin with multi-branch imports
22144 Oops, fix --with-origin to /really/ also call git fetch :)
22145 Avoid creating non-p4 branches in remotes/p4 off of remotes/origin
22146 Make git-p4 work with packed refs (don't use os.path.exists to check for the existance of a ref)
22147 Make --with-origin also work without origin :)
22148 Make --with-origin the default for syncing.
22149 Shortcut the case where we have no origin branch
22150 Forgot to remove this TODO item when I made --with-origin the default :)
22151 Added git-p4 submit --trust-me-like-a-fool for the adventurous users :)
22152 Fix creation of refs/remotes/p4/HEAD symbolic ref
22153 Fix my email address, this isn't really KDE related :)
22154 In *_pipe print the command that failed if it fails. Fixed old calls to mypopen.
22155 Fix typo in listExistingP4Branches that broke sync.
22156 Fix support for "depot-path" in older git-p4 imports
22157 Fix common path "calculation" from logs of multiple branches. Need to use min instead of max for prev/cur to avoid out-of-bounds string access. Also treat "i" as index of the last match instead of a length because in case of a complete match of the two strings i was off by one.
22158 Don't attempt to set the initialParent on multi-branch imports (useless). At some point the code paths should be unified, but for now I need a working git-p4 :)
22159 Hack to make the multi-branch import work again with self.depotPaths now that self.depotPath is gone
22162 Fix depot-path determination for git-p4 submit
22163 Make clone behave like git clone by default again.
22164 Make git-p4 submit detect the correct reference (origin) branch when working with multi-branch imports.
22165 Only get the expensive branch mapping from the p4 server when not syncing with the help of an origin remote (which we instead then use to get new branches from).
22166 Fixed the check to make sure to exclude the HEAD symbolic refs when updating the remotes/p4 branches from origin.
22167 Fix updating/creating remotes/p4/* heads from origin/p4/*
22168 Fix project name guessing
22169 Fix depot-paths encoding for multi-path imports (don't split up //depot/path/foo)
22170 Fix support for explicit disabling of syncing with the origin
22171 Write out the options tag in the log message of imports only if we actually have options
22172 Provide some information for single branch imports where the commits go
22173 Mention remotes/p4/master also in the documentation.
22174 git-p4 submit: Fix missing quotes around p4 commands to make them work with spaces in filenames
22175 Moved the code from git-p4 submit to figure out the upstream branch point into a separate helper method.
22176 Fix git-p4 rebase to detect the correct upstream branch instead of unconditionally always rebasing on top of remotes/p4/master
22177 Fix initial multi-branch import.
22178 Fix the branch mapping detection to be independent from the order of the "p4 branches" output.
22179 Warn about conflicting p4 branch mappings and use the first one found.
22180 Added git-p4 branches command that shows the mapping of perforce depot paths to imported git branches.
22181 Make it possible to specify the HEAD for the internal findUpstreamBranchPoint function.
22182 git-new-workdir: Fix shell warning about operator == used with test.
22184 Sven Verdoolaege (4):
22185 git-update-ref: add --no-deref option for overwriting/detaching ref
22186 t9500: skip gitweb tests if perl version is too old
22187 git-submodule: provide easy way of adding new submodules
22188 git-clone: fetch possibly detached HEAD over dumb http
22191 Add --aggressive option to 'git gc'
22192 Fix minor grammatical typos in the git-gc man page
22193 git-mergetool: Make default selection of merge-tool more intelligent
22194 Don't fflush(stdout) when it's not helpful
22197 Change default man page path to /usr/share/man
22200 Version v1.5.2.5; changes since v1.5.2.4:
22201 -----------------------------------------
22203 Christian Couder (1):
22204 rev-list --bisect: fix allocation of "int*" instead of "int".
22206 Julian Phillips (1):
22207 Force listingblocks to be monospaced in manpages
22209 Junio C Hamano (4):
22210 Do not expect unlink(2) to fail on a directory.
22211 setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
22212 Fix "git add -u" data corruption.
22215 Linus Torvalds (1):
22216 apply: remove directory that becomes empty by renaming the last file away
22218 Salikh Zakirov (1):
22219 git-add -u paths... now works from subdirectory
22222 Version v1.5.2.4; changes since v1.5.2.3:
22223 -----------------------------------------
22226 Make git-prune submodule aware (and fix a SEGFAULT in the process)
22227 user-manual: grammar and style fixes
22230 git-gui: properly popup error if gitk should be started but is not installed
22232 J. Bruce Fields (2):
22234 user-manual: more explanation of push and pull usage
22237 Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long
22239 Johannes Schindelin (3):
22240 diff --no-index: fix --name-status with added files
22241 glossary: add 'reflog'
22242 Fix "apply --reverse" with regard to whitespace
22244 Junio C Hamano (2):
22245 Teach read-tree 2-way merge to ignore intermediate symlinks
22248 Michael Hendricks (1):
22249 Correctly document the name of the global excludes file configuration
22252 Document -<n> for git-format-patch
22254 Shawn O. Pearce (10):
22255 git-gui: Unlock the index when cancelling merge dialog
22256 git-gui: Don't bind F5/M1-R in all windows
22257 git-gui: Bind M1-P to push action
22258 git-gui: Include a Push action on the left toolbar
22259 git-gui: Ensure windows shortcuts always have .bat extension
22260 git-gui: Skip nicknames when selecting author initials
22261 git-gui: Correct ls-tree buffering problem in browser
22262 git-gui: Don't linewrap within console windows
22263 Clarify documentation of fast-import's D subcommand
22264 git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}
22266 William Pursell (1):
22267 user-manual: fix directory name in git-archive example
22270 Version v1.5.2.3; changes since v1.5.2.2:
22271 -----------------------------------------
22273 Frank Lichtenheld (2):
22274 config: Complete documentation of --get-regexp
22275 config: Change output of --get-regexp for valueless keys
22277 Junio C Hamano (1):
22280 Linus Torvalds (1):
22281 Fix zero-object version-2 packs
22284 Correct the name of NO_R_TO_GCC_LINKER in the comment describing it.
22287 cleanup merge-base test script
22288 repack: improve documentation on -a option
22289 git-remote: document -n
22291 Shawn O. Pearce (5):
22292 git-gui: Correctly install to /usr/bin on Cygwin
22293 git-gui: Bind Tab/Shift-Tab to cycle between panes in blame
22294 git-gui: Don't require $DISPLAY just to get --version
22295 git-gui: Don't nice git blame on MSYS as nice is not supported
22296 git-gui: Don't require a .pvcsrc to create Tools/Migrate menu hack
22298 Sven Verdoolaege (1):
22299 Ignore submodule commits when fetching over dumb protocols
22302 Version v1.5.2.2; changes since v1.5.2.1:
22303 -----------------------------------------
22306 Make the installation target of git-gui a little less chatty
22307 Fix clone to setup the origin if its name ends with .git
22308 Add a local implementation of hstrerror for the system which do not have it
22311 Fix typo in remote branch example in git user manual
22313 J. Bruce Fields (4):
22314 user-manual: quick-start updates
22315 user-manual: add a missing section ID
22316 Documentation: user-manual todo
22317 tutorial: use "project history" instead of "changelog" in header
22319 Jakub Narebski (1):
22320 Generated spec file to be ignored is named git.spec and not git-core.spec
22322 Johannes Schindelin (2):
22323 Move buffer_is_binary() to xdiff-interface.h
22324 merge-recursive: refuse to merge binary files
22327 Accept dates before 2000/01/01 when specified as seconds since the epoch
22329 Junio C Hamano (6):
22330 checkout: do not get confused with ambiguous tag/branch names
22331 $EMAIL is a last resort fallback, as it's system-wide.
22332 git-branch --track: fix tracking branch computation.
22333 Avoid diff cost on "git log -z"
22334 Documentation: adjust to AsciiDoc 8
22337 Kristian Høgsberg (1):
22338 Unquote From line from patch before comparing with given from address.
22340 Luiz Fernando N. Capitulino (1):
22341 git-cherry: Document 'limit' command-line option
22343 Matthijs Melchior (1):
22344 New selection indication and softer colors
22346 Michael Milligan (1):
22347 git-cvsimport: Make sure to use $git_dir always instead of .git sometimes
22350 fix documentation of unpack-objects -n
22351 Don't assume tree entries that are not dirs are blobs
22353 Shawn O. Pearce (47):
22354 git-gui: Allow creating a branch when none exists
22355 git-gui: Allow as few as 0 lines of diff context
22356 git-gui: Don't quit when we destroy a child widget
22357 git-gui: Attach font_ui to all spinbox widgets
22358 git-gui: Verify Tcl/Tk is new enough for our needs
22359 Revert "Make the installation target of git-gui a little less chatty"
22360 git-gui: Add a 4 digit commit abbreviation to the blame viewer
22361 git-gui: Cleanup blame::new widget initialization
22362 git-gui: Remove empty blank line at end of blame
22363 git-gui: Improve the coloring in blame viewer
22364 git-gui: Simplify consecutive lines that come from the same commit
22365 git-gui: Use arror cursor in blame viewer file data
22366 git-gui: Display tooltips in blame viewer
22367 git-gui: Highlight the blame commit header from everything else
22368 git-gui: Remove unnecessary reshow of blamed commit
22369 git-gui: Cleanup minor style nit
22370 git-gui: Space the commit group continuation out in blame view
22371 git-gui: Show author initials in blame groups
22372 git-gui: Allow the user to control the blame/commit split point
22373 git-gui: Display a progress bar during blame annotation gathering
22374 git-gui: Allow digging through history in blame viewer
22375 git-gui: Combine blame groups only if commit and filename match
22376 git-gui: Show original filename in blame tooltip
22377 git-gui: Use a label instead of a button for the back button
22378 git-gui: Clip the commit summaries in the blame history menu
22379 git-gui: Remove the loaded column from the blame viewer
22380 git-gui: Remove unnecessary space between columns in blame viewer
22381 git-gui: Use lighter colors in blame view
22382 git-gui: Make the line number column slightly wider in blame
22383 git-gui: Automatically expand the line number column as needed
22384 git-gui: Remove unused commit_list from blame viewer
22385 git-gui: Better document our blame variables
22386 git-gui: Cleanup redundant column management in blame viewer
22387 git-gui: Switch internal blame structure to Tcl lists
22388 git-gui: Label the uncommitted blame history entry
22389 git-gui: Rename fields in blame viewer to better descriptions
22390 git-gui: Display the "Loading annotation..." message in italic
22391 git-gui: Run blame twice on the same file and display both outputs
22392 git-gui: Display both commits in our tooltips
22393 git-gui: Jump to original line in blame viewer
22394 git-gui: Use three colors for the blame viewer background
22395 git-gui: Improve our labeling of blame annotation types
22396 git-gui: Favor the original annotations over the recent ones
22397 git-gui: Changed blame header bar background to match main window
22398 git-gui: Include 'war on whitespace' fixes from git.git
22399 git-gui: Give amend precedence to HEAD over MERGE_MSG
22400 git-gui: Save geometry before the window layout is damaged
22402 William Pursell (1):
22403 Make command description imperative statement, not third-person present.
22406 Version v1.5.2.1; changes since v1.5.2:
22407 ---------------------------------------
22410 Fix mishandling of $Id$ expanded in the repository copy in convert.c
22411 Add test case for $Id$ expanded in the repository
22414 fix memory leak in parse_object when check_sha1_signature fails
22417 git-svn: avoid md5 calculation entirely if SVN doesn't provide one
22419 Fernando J. Pereda (1):
22420 Use PATH_MAX instead of TEMPFILE_PATH_LEN
22422 Frank Lichtenheld (7):
22423 t1300: Add tests for git-config --bool --get
22424 git-config: Correct asciidoc documentation for --int/--bool
22425 cvsserver: Correct inetd.conf example in asciidoc documentation
22426 cvsserver: Note that CVS_SERVER can also be specified as method variable
22427 cvsserver: Fix some typos in asciidoc documentation
22428 git-config: Various small fixes to asciidoc documentation
22429 git-config: Improve documentation of git-config file handling
22431 Jakub Narebski (3):
22432 Documentation: Clean up links in GIT Glossary
22433 Replace the last 'dircache's by 'index'
22434 Documentation: Add definition of "evil merge" to GIT Glossary
22437 Documentation: fix git-config.xml generation
22439 James Y Knight (1):
22440 Fix git-svn to handle svn not reporting the md5sum of a file, and test.
22443 git-am: use printf instead of echo on user-supplied strings
22444 More echo "$user_message" fixes.
22445 Documentation: robustify asciidoc GIT_VERSION replacement
22447 Jerald Fitzjerald (1):
22448 decode_85(): fix missing return.
22451 git-daemon: don't ignore pid-file write failure
22454 Fix stupid typo in lookup_tag()
22456 Johannes Schindelin (2):
22457 SubmittingPatches: mention older C compiler compatibility
22458 git-status: respect core.excludesFile
22461 branch: fix segfault when resolving an invalid HEAD
22462 Update bash completion to ignore some more plumbing commands
22465 Create a new manpage for the gitignore format, and reference it elsewhere
22467 Junio C Hamano (6):
22468 annotate: make it work from subdirectories.
22469 git-cvsserver: fix disabling service via per-method config
22470 name-rev: tolerate clock skew in committer dates
22471 git-commit: use printf '%s\n' instead of echo on user-supplied strings
22472 Add tests for the last two fixes.
22475 Kristian Høgsberg (1):
22476 Use =20 when rfc2047 encoding spaces.
22478 Linus Torvalds (1):
22479 fix signed range problems with hex conversions
22481 Nguyễn Thái Ngọc Duy (1):
22482 Makefile: Remove git-fsck and git-verify-pack from PROGRAMS
22485 Document branch.autosetupmerge.
22487 Shawn O. Pearce (12):
22488 git-gui: Tighten internal pattern match for lib/ directory
22489 Refactor fast-import branch creation from existing commit
22490 Fix possible coredump with fast-import --import-marks
22491 Hide the plumbing diff-{files,index,tree} from bash completion
22492 Teach bash completion about git-shortlog
22493 Remove a duplicate --not option in bash completion
22494 Update bash completion header documentation
22495 Teach bash completion about 'git remote update'
22496 Teach bash completion about recent log long options
22497 Update bash completion for git-config options
22498 Correct key bindings to Control-<foo>
22499 git-gui: Guess our share/git-gui/lib path at runtime if possible
22501 Simon Hausmann (2):
22502 fast-import: Fix uninitialized variable
22503 fast-import: Fix crash when referencing already existing objects
22505 Steffen Prohaska (1):
22506 user-manual: fixed typo in example
22508 Stephan Springl (1):
22509 Use git-for-each-ref to check whether the origin branch exists.
22511 Sven Verdoolaege (1):
22512 unpack-trees.c: verify_uptodate: remove dead code
22515 Version v1.5.2; changes since v1.5.2-rc3:
22516 -----------------------------------------
22519 Allow fetching references from any namespace
22522 Use $Id$ as the ident attribute keyword rather than $ident$ to be consistent with other VCSs
22523 Fix crlf attribute handling to match documentation
22525 Andy Whitcroft (1):
22526 git name-rev writes beyond the end of malloc() with large generations
22529 git-svn: don't drop the username from URLs when dcommit is run
22530 git-svn: clean up caching of SVN::Ra functions
22531 git-svn: fix segfaults due to initial SVN pool being cleared
22532 git-svn: don't attempt to minimize URLs by default
22533 git-svn: avoid crashing svnserve when creating new directories
22534 git-svn: don't minimize-url when doing an init that tracks multiple paths
22536 Frank Lichtenheld (5):
22537 cvsserver: Limit config parser to needed options
22538 cvsserver: Don't send mixed messages to clients
22539 builtin-log.c: Fix typo in comment
22540 Documentation: format-patch has no --mbox option
22541 git-am: Clean up the asciidoc documentation
22543 J. Bruce Fields (14):
22544 user-manual: revise birdseye-view chapter
22545 glossary: expand and clarify some definitions, prune cross-references
22546 user-manual: move quick-start to an appendix
22547 Documentation: remove howto's now incorporated into manual
22548 user-manual: move howto/make-dist.txt into user manual
22549 user-manual: move howto/using-topic-branches into manual
22550 user-manual: add a "counting commits" example
22551 user-manual: introduce git
22552 user-manual: listing commits reachable from some refs not others
22553 user-manual: reorganize public git repo discussion
22554 tutorials: add user-manual links
22555 tutorial: revise index introduction
22556 user-manual: discourage shared repository
22557 user-manual: finding commits referencing given file content
22559 Jakub Narebski (10):
22560 gitweb: Test if $from_id and $to_id are defined before comparison
22561 gitweb: Check if requested object exists
22562 gitweb: Fix "Use of unitialized value" warnings in empty repository
22563 Documentation: Split description of pretty formats of commit log
22564 gitweb: Add a few comments about %feature hash
22565 gitweb: Do not use absolute font sizes
22566 gitweb: Separate search regexp from search text
22567 gitweb: Empty patch for merge means trivial merge, not no differences
22568 gitweb: Fix error in git_patchset_body for deletion in merge commit
22569 gitweb: Fix "Use of uninitialized value" warning in git_feed
22572 Updated documentation of hooks in git-receive-pack.
22573 Minor fixup to documentation of hooks in git-receive-pack.
22576 git-add: allow path limiting with -u
22577 Documentation/git-add: clarify -u with path limiting
22578 format-patch: add MIME-Version header when we add content-type.
22581 Fix signedness on return value from xread()
22582 Ensure return value from xread() is always stored into an ssize_t
22583 user-manual: Add section on ignoring files
22585 Johannes Schindelin (2):
22586 import-tars: Use the "Link indicator" to identify directories
22587 Add a birdview-on-the-source-code section to the user manual
22589 Junio C Hamano (17):
22590 Minor copyediting on Release Notes for 1.5.2
22591 Add has_symlink_leading_path() function.
22592 apply: do not get confused by symlinks in the middle
22593 read-tree -m -u: avoid getting confused by intermediate symlinks.
22594 t9400: Use the repository config and nothing else.
22595 checkout: allow detaching to HEAD even when switching to the tip of a branch
22596 git-config: do not forget seeing "a.b.var" means we are out of "a.var" section.
22597 Link to HTML version of external doc if available
22598 Fix git-clone buglet for remote case.
22599 Prepare for 1.5.1.5 Release Notes
22600 gitweb: fix another use of undefined value
22602 Add link to 1.5.1.5 release notes.
22603 Documentation/git.txt: Update links to older documentation pages.
22605 git-cvsserver: exit with 1 upon "I HATE YOU"
22609 git-archive: don't die when repository uses subprojects
22611 Marco Costalba (1):
22612 Fix an unmatched comment end in arm/sha1_arm.S
22614 Matthias Kestenholz (2):
22615 Documentation: Added [verse] to SYNOPSIS where necessary
22616 Documentation: Reformatted SYNOPSIS for several commands
22618 Matthieu Castet (1):
22619 Remove stale non-static-inline prototype for tree_entry_extract()
22621 Michael Hendricks (2):
22622 git-send-email: allow leading white space on mutt aliases
22623 Document core.excludesfile for git-add
22626 gitweb: Normalize searchbar font size
22627 gitweb: Add support for grep searches
22628 gitweb: Allow arbitrary strings to be dug with pickaxe
22629 Documentation: git-rev-list's "patterns"
22630 gitweb: Remove redundant $searchtype setup
22633 RPM spec: include files in technical/ to package.
22634 Documentation/branch: fix small typo in -D example
22637 git-archive: convert archive entries like checkouts do
22639 Shawn O. Pearce (1):
22640 git-gui: Gracefully handle bad TCL_PATH at compile time
22642 Steffen Prohaska (4):
22643 tiny fix in documentation of git-clone
22644 git-config: test for 'do not forget "a.b.var" ends "a.var" section'.
22645 Optimized cvsexportcommit: calling 'cvs status' once instead of once per touched file.
22646 Fixed link in user-manual
22649 Version v1.5.2-rc3; changes since v1.5.2-rc2:
22650 ---------------------------------------------
22653 Use GIT_OBJECT_DIR for temporary files of pack-objects
22655 Amos Waterland (1):
22656 wcwidth redeclaration
22658 Frank Lichtenheld (1):
22659 cvsserver: Add test cases for git-cvsserver
22662 gitweb: choose appropriate view for file type if a= parameter missing
22664 J. Bruce Fields (7):
22665 user-manual: more discussion of detached heads, fix typos
22666 user-manual: add section ID's
22667 user-manual: clean up fast-forward and dangling-objects sections
22668 user-manual: fix .gitconfig editing examples
22669 user-manual: miscellaneous editing
22670 user-manual: stop deprecating the manual
22671 user-manual: fix clone and fetch typos
22673 Jakub Narebski (6):
22674 gitweb: Add parsing of raw combined diff format to parse_difftree_raw_line
22675 gitweb: Add combined diff support to git_difftree_body
22676 gitweb: Add combined diff support to git_patchset_body
22677 gitweb: Make it possible to use pre-parsed info in git_difftree_body
22678 gitweb: Show combined diff for merge commits in 'commitdiff' view
22679 gitweb: Show combined diff for merge commits in 'commit' view
22682 SPECIFYING RANGES typo fix: it it => it is
22685 Documentation: don't reference non-existent 'git-cvsapplycommit'
22688 git-gui: Call changes "Staged" and "Unstaged" in file list titles.
22690 Junio C Hamano (10):
22691 diff: release blobs after generating textual diff.
22692 diff.c: do not use a separate "size cache".
22693 diff -M: release the preimage candidate blobs after rename detection.
22694 diff -S: release the image after looking for needle in it
22696 Update documentation links to point at 1.5.1.4
22697 t9400: skip cvsserver test if Perl SQLite interface is unavailable
22698 git-clone: don't get fooled by $PWD
22699 .mailmap: add some aliases
22703 Document git add -u introduced earlier.
22704 Added a reference to git-add in the documentation for git-update-index
22706 Michael Hendricks (1):
22707 Document 'git-log --decorate'
22710 dir.c: Omit non-excluded directories with dir->show_ignored
22711 t7300: Basic tests for git-clean
22712 Fix minor documentation errors
22714 Paul Mackerras (1):
22715 gitk: Allow user to choose whether to see the diff, old file, or new file
22718 Git.pm: config_boolean() -> config_bool()
22719 gitweb: Do not use absolute font sizes
22722 Add howto files to rpm packages.
22723 Added new git-gui library files to rpm spec
22725 Richard P. Curnow (2):
22726 Fix documentation of tag in git-fast-import.txt
22727 Fix documentation of tag in git-fast-import.txt
22729 Shawn O. Pearce (32):
22730 git-gui: Correctly handle UTF-8 encoded commit messages
22731 git-gui: Allow spaces in path to 'wish'
22732 git-gui: Include the subject in the status bar after commit
22733 git-gui: Warn users before making an octopus merge
22734 git-gui: Correct line wrapping for too many branch message
22735 git-gui: Cleanup common font handling for font_ui
22736 git-gui: Use option database defaults to set the font
22737 git-gui: Refactor to use our git proc more often
22738 git-gui: Track our own embedded values and rebuild when they change
22739 Properly handle '0' filenames in import-tars
22740 git-gui: Refactor into multiple files to save my sanity
22741 git-gui: Move console procs into their own namespace
22742 git-gui: Allow vi keys to scroll the diff/blame regions
22743 git-gui: Move merge support into a namespace
22744 git-gui: Show all possible branches for merge
22745 git-gui: Include commit id/subject in merge choices
22746 git-gui: Use vi-like keys in merge dialog
22747 Remove duplicate exports from Makefile
22748 git-gui: Allow shift-{k,j} to select a range of branches to merge
22749 git-gui: Define a simple class/method system
22750 git-gui: Convert browser, console to "class" format
22751 git-gui: Don't attempt to inline array reads in methods
22752 git-gui: Convert blame to the "class" way of doing things
22753 git-gui: Use prefix if blame is run in a subdirectory
22754 git-gui: Smarter command line parsing for browser, blame
22755 git-gui: Generate blame on uncommitted working tree file
22756 git-gui: Cleanup minor nits in blame code
22757 git-gui: Format author/committer times in ISO format
22758 Use .git/MERGE_MSG in cherry-pick/revert
22759 git-gui: Paperbag fix blame in subdirectory
22761 Correct error message in revert/cherry-pick
22764 Add pack.depth option to git-pack-objects.
22765 Increase pack.depth default to 50
22768 Version v1.5.2-rc2; changes since v1.5.2-rc1:
22769 ---------------------------------------------
22772 Small correction in reading of commit headers
22773 Handle return code of parse_commit in revision machinery
22775 Alexandre Julliard (1):
22776 http-fetch: Disable use of curl multi support for libcurl < 7.16.
22778 Arjen Laarhoven (1):
22779 Document 'opendiff' value in config.txt and git-mergetool.txt
22782 Allow PERL_PATH="/usr/bin/env perl"
22783 posix compatibility for t4200
22786 Mention version 1.5.1 in tutorial and user-manual
22789 Create pack-write.c for common pack writing code
22791 Daniel Barkalow (1):
22792 Make xstrndup common
22794 Frank Lichtenheld (1):
22795 cvsserver: Handle re-added files correctly
22797 Jakub Narebski (1):
22798 diff format documentation: describe raw combined diff format
22801 Documentation: fix typo in git-remote.txt
22803 Johannes Schindelin (1):
22804 Teach import-tars about GNU tar's @LongLink extension.
22807 git-tag(1): -v option is a subcommand; fix code block
22809 Junio C Hamano (6):
22810 blame: use .mailmap unconditionally
22811 diff.c: fix "size cache" handling.
22812 blame: Notice a wholesale incorporation of an existing file.
22814 Add test for blame corner cases.
22817 Karl Hasselström (2):
22818 Fix markup in git-svn man page
22819 Add --no-rebase option to git-svn dcommit
22821 Linus Torvalds (1):
22822 Fix --boundary output
22824 Martin Koegler (1):
22825 Fix compilation of test-delta
22827 Shawn O. Pearce (3):
22828 Reuse fixup_pack_header_footer in index-pack
22829 Don't use seq in tests, not everyone has it
22830 Improve request-pull to handle non-rebased branches
22833 gitweb: use decode_utf8 directly
22836 Version v1.5.2-rc1; changes since v1.5.2-rc0:
22837 ---------------------------------------------
22840 Remove usernames from all commit messages, not just when using svmprops
22841 git-svn: Don't rely on $_ after making a function call
22842 git-svn: Ignore usernames in URLs in find_by_url
22843 git-svn: Added 'find-rev' command
22844 git-svn: Add 'find-rev' command
22847 Fix handle leak in write_tree
22848 Avoid excessive rewrites in merge-recursive
22849 Add a test for merging changed and rename-changed branches
22850 Ignore merged status of the file-level merge
22851 Use strlcpy instead of strncpy in mailmap.c
22852 Fix read_mailmap to handle a caller uninterested in repo abbreviation
22853 Remove pointless calls to access(2) when checking for .mailmap
22854 Include mailmap.h in mailmap.c to catch mailmap interface changes
22857 Removing -n option from git-diff-files documentation
22858 Document additional options for git-fetch
22859 Update git-fmt-merge documentation
22860 Update git-grep documentation
22861 Update -L documentation for git-blame/git-annotate
22862 Update git-http-push documentation
22863 Update git-local-fetch documentation
22864 Update git-http-fetch documentation
22867 post-receive-email example hook: fastforward should have been fast_forward
22868 post-receive-email example hook: detect rewind-only updates and output sensible message
22869 post-receive-email example hook: sed command for getting description was wrong
22871 Brian Gernhardt (2):
22872 Reverse the order of -b and --track in the man page.
22873 Ignore all man sections as they are generated files.
22876 Documentation/git-reset.txt: suggest git commit --amend in example.
22879 Clarify SubmittingPatches Checklist
22880 git.7: Mention preformatted html doc location
22881 send-email documentation: clarify --smtp-server
22883 Johannes Schindelin (3):
22884 dir.c(common_prefix): Fix two bugs
22885 t4201: Do not display weird characters on the terminal
22886 import-tars: be nice to wrong directory modes
22889 Add clean.requireForce option, and add -f option to git-clean to override it
22890 Fix typo in git-am: s/Was is/Was it/
22891 Create a sysconfdir variable, and use it for ETC_GITCONFIG
22892 Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
22893 Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAIL
22895 Julian Phillips (1):
22896 http.c: Fix problem with repeated calls of http_init
22898 Junio C Hamano (25):
22899 Move index-related variables into a structure.
22900 Make read-cache.c "the_index" free.
22901 Document "diff=driver" attribute
22902 t5302: avoid using tail -c
22903 t6030: grab commit object name as we go
22904 Build RPM with ETC_GITCONFIG=/etc/gitconfig
22905 Diff between two blobs should take mode changes into account now.
22906 t/test-lib.sh: Protect ourselves from common misconfiguration that exports CDPATH to the environment
22907 gitattributes documentation: clarify overriding
22908 applymbox & quiltimport: typofix.
22909 Add 'ident' conversion.
22910 Add 'filter' attribute and external filter driver definition.
22911 Add --date={local,relative,default}
22912 Start preparing for 1.5.1.3
22913 Do not barf on too long action description
22914 Update .mailmap with "Michael"
22915 Fix import-tars fix.
22916 blame -s: suppress author name and time.
22917 Split out mailmap handling out of shortlog
22918 Apply mailmap in git-blame output.
22919 Make macros to prevent double-inclusion in headers consistent.
22920 Make sure test-genrandom and test-chmtime are builtas part of the main build.
22921 Fix symlink handling in git-svn, related to PerlIO
22925 Luiz Fernando N. Capitulino (5):
22926 remove_subtree(): Use strerror() when possible
22927 entry.c: Use const qualifier for 'struct checkout' parameters
22928 read_cache_from(): small simplification
22929 core-tutorial: minor fixes
22930 init_buffer(): Kill buf pointer
22932 Martin Koegler (5):
22933 Add S_IFINVALID mode
22934 add get_sha1_with_mode
22935 add add_object_array_with_mode
22936 store mode in rev_list, if <tree>:<filename> syntax is used
22937 use mode of the tree in git-diff, if <tree>:<file> syntax is used
22939 Michele Ballabio (1):
22940 git shortlog documentation: add long options and fix a typo
22943 add file checkout progress
22945 OGAWA Hirofumi (1):
22946 git-fetch: Fix "argument list too long"
22948 Robin H. Johnson (10):
22949 Document --dry-run parameter to send-email.
22950 Prefix Dry- to the message status to denote dry-runs.
22951 Debugging cleanup improvements
22952 Change the scope of the $cc variable as it is not needed outside of send_message.
22953 Perform correct quoting of recipient names.
22954 Validate @recipients before using it for sendmail and Net::SMTP.
22955 Ensure clean addresses are always used with Net::SMTP
22956 Allow users to optionally specify their envelope sender.
22957 Document --dry-run and envelope-sender for git-send-email.
22958 Sanitize @to recipients.
22961 fast-import: size_t vs ssize_t
22963 Shawn O. Pearce (4):
22964 Don't repack existing objects in fast-import
22965 Actually handle some-low memory conditions
22966 Don't allow empty pathnames in fast-import
22967 Catch empty pathnames in trees during fsck
22969 Uwe Kleine-König (1):
22970 fix importing of subversion tars
22973 Version v1.5.2-rc0; changes since v1.5.1.6:
22974 -------------------------------------------
22977 Fix passing of TCLTK_PATH to git-gui
22978 Fix t4201: accidental arithmetic expansion
22979 Fix permissions on test scripts
22980 Tests for core subproject support
22981 Simplify calling of CR/LF conversion routines
22982 Fix a typo in crlf conversion code
22983 Fix crash in t0020 (crlf conversion)
22985 Alexandre Julliard (1):
22986 git.el: Add a commit description to the reflog.
22989 Add policy on user-interface changes
22992 Show binary file size change in diff --stat
22994 Aneesh Kumar K.V (1):
22995 gitview: annotation support
22997 Brian Gernhardt (2):
22998 Remove unused WITH_OWN_SUBPROCESS_PY from RPM spec
22999 Remove case-sensitive file in t3030-merge-recursive.
23001 Christian Couder (4):
23002 Bisect: teach "bisect start" to optionally use one bad and many good revs.
23003 Documentation: bisect: "start" accepts one bad and many good commits
23004 Bisect: simplify "bisect start" logging.
23005 Bisect: rename "t/t6030-bisect-run.sh" to "t/t6030-bisect-porcelain.sh".
23008 git-svn: bail out on incorrect command-line options
23010 Eygene Ryabinkin (11):
23011 Add the WITH_P4IMPORT knob to the Makefile.
23012 Added git-p4 package to the list of git RPMs.
23013 Added correct Python path to the RPM specfile.
23015 Add --with-tcltk and --without-tcltk to configure.
23016 Rewrite Tcl/Tk interpreter path for the GUI tools.
23017 Eliminate checks of user-specified Tcl/Tk interpreter.
23018 Allow wish interpreter to be defined with TCLTK_PATH
23019 Teach git-gui to use the user-defined UI font everywhere.
23020 Improve look-and-feel of the git-gui tool.
23021 Do not break git-gui messages into multiple lines.
23023 Fernando J. Pereda (1):
23024 Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.
23026 Frank Lichtenheld (16):
23027 cvsserver: Introduce new state variable 'method'
23028 cvsserver: Handle three part keys in git config correctly
23029 cvsserver: Allow to override the configuration per access method
23030 cvsserver: Make the database backend configurable
23031 cvsserver: Abort if connect to database fails
23032 Documentation: Replace @@GIT_VERSION@@ in documentation
23033 Documentation: Add version information to man pages
23034 cvsserver: Use DBI->table_info instead of DBI->tables
23035 cvsserver: Corrections to the database backend configuration
23036 cvsserver: Add asciidoc documentation for new database backend configuration
23037 gitweb: Allow forks with project list file
23038 gitweb: Allow configuring the default projects order and add order 'none'
23039 cvsserver: Allow to "add" a removed file
23040 cvsserver: Reword documentation on necessity of write access
23041 cvsserver: Document the GIT branches -> CVS modules mapping more prominently
23042 config.txt: Add gitcvs.db* variables
23044 Jakub Narebski (2):
23045 gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (3)
23046 gitweb: Quote hash keys, and do not use barewords keys
23049 Document git-check-attr
23052 sscanf/strtoul: parse integers robustly
23054 Johannes Schindelin (1):
23055 Use print_wrapped_text() in shortlog
23057 Julian Phillips (1):
23058 refs.c: add a function to sort a ref list, rather then sorting on add
23060 Junio C Hamano (83):
23061 git-fetch: add --quiet
23062 t6002: minor spelling fix.
23063 git-rev-list: add --bisect-vars option.
23064 git-rev-list --bisect: optimization
23065 t6004: add a bit more path optimization test.
23066 rev-list --bisect: Fix "halfway" optimization.
23067 make the previous optimization work also on path-limited rev-list --bisect
23068 Documentation: unbreak user-manual.
23069 Optional Tck/Tk: ignore generated files.
23070 checkout: allow detaching to HEAD even when switching to the tip of a branch
23071 _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.
23072 git-read-tree --index-output=<file>
23073 add_cache_entry(): removal of file foo does not conflict with foo/bar
23074 unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.
23075 unpack-trees: get rid of *indpos parameter.
23076 Fix read-tree --prefix=dir/.
23077 Fix twoway_merge that passed d/f conflict marker to merged_entry().
23078 Fix switching to a branch with D/F when current branch has file D.
23079 RPM spec: include git-p4 in the list of all packages.
23080 Fix bogus error message from merge-recursive error path
23081 Propagate cache error internal to refresh_cache() via parameter.
23082 Rename internal function "add_file_to_cache" in builtin-update-index.c
23083 Rename static variable write_index to update_index in builtin-apply.c
23084 Rename add_file_to_index() to add_file_to_cache()
23085 git-bisect: modernization
23086 t6030: add a bit more tests to git-bisect
23087 git-bisect: allow bisecting with only one bad commit.
23088 git-push reports the URL after failing.
23089 git-push to multiple locations does not stop at the first failure
23090 A new merge stragety 'subtree'.
23091 Start 1.5.2 cycle by prepareing RelNotes for it.
23092 shortlog -w: make wrap-line behaviour optional.
23093 t1000: fix case table.
23094 Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
23095 merge-recursive: do not barf on "to be removed" entries.
23096 merge-recursive: handle D/F conflict case more carefully.
23097 t3030: merge-recursive backend test.
23098 git-fetch--tool pick-rref
23099 git-fetch: use fetch--tool pick-rref to avoid local fetch from alternate
23100 Add %m to '--pretty=format:'
23101 Refactor patch-id filtering out of git-cherry and git-format-patch.
23102 git-log --cherry-pick A...B
23103 Documentation: --cherry-pick
23104 Fix git {log,show,...} --pretty=email
23105 Add basic infrastructure to assign attributes to paths
23106 Define 'crlf' attribute.
23107 Teach 'diff' about 'diff' attribute.
23108 Fix 'crlf' attribute semantics.
23109 Fix 'diff' attribute semantics.
23110 Makefile: add patch-ids.h back in.
23111 attribute macro support
23112 Define a built-in attribute macro "binary".
23113 Change attribute negation marker from '!' to '-'.
23114 send-email: do not leave an empty CC: line if no cc is present.
23115 Make sure quickfetch is not fooled with a previous, incomplete fetch.
23116 Allow more than true/false to attributes.
23117 merge-recursive: separate out xdl_merge() interface.
23118 git-gui: Honor TCLTK_PATH if supplied
23119 Allow specifying specialized merge-backend per path.
23120 Add a demonstration/test of customized merge.
23121 Update draft release notes for 1.5.2 with accumulated changes.
23122 Custom low-level merge driver support.
23123 Allow the default low-level merge driver to be configured.
23124 Custom low-level merge driver: change the configuration scheme.
23125 Allow low-level driver to specify different behaviour during internal merge.
23126 Fix funny types used in attribute value representation
23127 Counto-fix in merge-recursive
23128 Simplify code to find recursive merge driver.
23129 Documentation: support manual section (5) - file formats.
23130 Update 'crlf' attribute semantics.
23131 Document gitattributes(5)
23132 git-add -u: match the index with working tree.
23133 Fix bogus linked-list management for user defined merge drivers.
23134 convert.c: restructure the attribute checking part.
23135 lockfile: record the primary process.
23136 Update documentation links to point at v1.5.1.2
23137 Documentation/Makefile: fix section (5) installation
23138 Update draft release notes for v1.5.2
23139 pack-objects: quickfix for permission modes.
23140 Fix 'quickfix' on pack-objects.
23141 Update tests not to assume that generated packfiles are writable.
23142 pack-objects: make generated packfile read-only
23143 Support 'diff=pgm' attribute
23145 Linus Torvalds (24):
23146 Optimize directory listing with pathspec limiter.
23147 diff-lib: use ce_mode_from_stat() rather than messing with modes manually
23148 Avoid overflowing name buffer in deep directory structures
23149 Add 'resolve_gitlink_ref()' helper function
23150 Add "S_IFDIRLNK" file mode infrastructure for git links
23151 Teach "fsck" not to follow subproject links
23152 Teach core object handling functions about gitlinks
23153 Fix thinko in subproject entry sorting
23154 Teach directory traversal about subprojects
23155 Teach git-update-index about gitlinks
23156 Don't show gitlink directories when we want "other" files
23157 Teach git list-objects logic not to follow gitlinks
23158 Teach "git-read-tree -u" to check out submodules as a directory
23159 Fix gitlink index entry filesystem matching
23160 Teach git list-objects logic to not follow gitlinks
23161 Teach "git-read-tree -u" to check out submodules as a directory
23162 Fix some "git ls-files -o" fallout from gitlinks
23163 Expose subprojects as special files to "git diff" machinery
23164 Add a generic "object decorator" interface, and make object refs use it
23165 Add support for "commit name decorations" to log family of commands
23166 Use proper object allocators for unknown object nodes too
23167 Clean up object creation to use more common code
23168 Fix working directory errno handling when unlinking a directory
23169 Fix a copy-n-paste bug in the object decorator code.
23171 Luiz Fernando N. Capitulino (2):
23172 ident.c: Use const qualifier for 'struct passwd' parameters
23173 ident.c: Use size_t (instead of int) to store sizes
23175 Martin Koegler (1):
23176 gitweb: Show "no difference" message for empty diff
23178 Michael S. Tsirkin (1):
23179 Display the subject of the commit just made.
23181 Nicolas Pitre (32):
23182 clean up and optimize nth_packed_object_sha1() usage
23183 get rid of num_packed_objects()
23184 make overflow test on delta base offset work regardless of variable size
23185 add overflow tests on pack offset variables
23186 compute a CRC32 for each object as stored in a pack
23187 compute object CRC32 with index-pack
23188 pack-objects: learn about pack index version 2
23189 index-pack: learn about pack index version 2
23190 sha1_file.c: learn about index version 2
23191 show-index.c: learn about index v2
23192 pack-redundant.c: learn about index v2
23193 allow forcing index v2 and 64-bit offset treshold
23194 validate reused pack data with CRC when possible
23195 simple random data generator for tests
23196 use test-genrandom in tests instead of /dev/urandom
23197 tests for various pack index features
23198 clean up add_object_entry()
23199 pack-objects: optimize preferred base handling a bit
23200 pack-objects: equal objects in size should delta against newer objects
23201 pack-objects: rework check_delta_limit usage
23202 pack-objects: clean up list sorting
23203 pack-objects: get rid of reuse_cached_pack
23204 pack-objects: get rid of create_final_object_list()
23205 pack-objects: make in_pack_header_size a variable of its own
23206 add get_size_from_delta()
23207 pack-objects: better check_object() performances
23208 pack-objects: remove obsolete comments
23209 document --index-version for index-pack and pack-objects
23210 common progress display support
23211 make progress "title" part of the common progress interface
23212 provide a facility for "delayed" progress reporting
23213 delay progress display when checking out files
23216 git-archive: make tar the default format
23218 Robin H. Johnson (2):
23219 Add custom subject prefix support to format-patch (take 3)
23220 Add testcase for format-patch --subject-prefix (take 3)
23222 Shawn O. Pearce (8):
23223 Always bind the return key to the default button
23224 Fix lost-found to show commits only referenced by reflogs
23225 Don't yap about merge-subtree during make
23226 git-gui: Display the directory basename in the title
23227 Revert "Allow wish interpreter to be defined with TCLTK_PATH"
23228 Contribute a fairly paranoid update hook
23229 Kill the useless progress meter in merge-recursive
23230 Cleanup variables in cat-file
23233 Add --quiet option to suppress output of "rm" commands for removed files.
23234 git-rm: Trivial fix for a comment typo.
23235 Add --ignore-unmatch option to exit with zero status when no files are removed.
23237 Xavier Maillard (2):
23238 git-blame.el: separate git-blame-mode to ease maintenance
23239 git-blame.el: pick a set of random colors for each git-blame turn
23242 Version v1.5.1.6; changes since v1.5.1.5:
23243 -----------------------------------------
23246 git-svn: avoid crashing svnserve when creating new directories
23247 git-svn: don't minimize-url when doing an init that tracks multiple paths
23249 J. Bruce Fields (4):
23250 tutorials: add user-manual links
23251 tutorial: revise index introduction
23252 user-manual: discourage shared repository
23253 user-manual: finding commits referencing given file content
23256 user-manual: Add section on ignoring files
23258 Junio C Hamano (1):
23261 Matthias Kestenholz (2):
23262 Documentation: Added [verse] to SYNOPSIS where necessary
23263 Documentation: Reformatted SYNOPSIS for several commands
23266 Version v1.5.1.5; changes since v1.5.1.4:
23267 -----------------------------------------
23270 Allow fetching references from any namespace
23272 Andy Whitcroft (1):
23273 git name-rev writes beyond the end of malloc() with large generations
23276 git-svn: don't drop the username from URLs when dcommit is run
23277 git-svn: clean up caching of SVN::Ra functions
23278 git-svn: fix segfaults due to initial SVN pool being cleared
23279 git-svn: don't attempt to minimize URLs by default
23281 Frank Lichtenheld (3):
23282 builtin-log.c: Fix typo in comment
23283 Documentation: format-patch has no --mbox option
23284 git-am: Clean up the asciidoc documentation
23286 J. Bruce Fields (10):
23287 user-manual: revise birdseye-view chapter
23288 glossary: expand and clarify some definitions, prune cross-references
23289 user-manual: move quick-start to an appendix
23290 Documentation: remove howto's now incorporated into manual
23291 user-manual: move howto/make-dist.txt into user manual
23292 user-manual: move howto/using-topic-branches into manual
23293 user-manual: add a "counting commits" example
23294 user-manual: introduce git
23295 user-manual: listing commits reachable from some refs not others
23296 user-manual: reorganize public git repo discussion
23298 Jakub Narebski (1):
23299 gitweb: Add a few comments about %feature hash
23302 Updated documentation of hooks in git-receive-pack.
23305 SPECIFYING RANGES typo fix: it it => it is
23308 format-patch: add MIME-Version header when we add content-type.
23310 Johannes Schindelin (2):
23311 import-tars: Use the "Link indicator" to identify directories
23312 Add a birdview-on-the-source-code section to the user manual
23314 Junio C Hamano (7):
23315 git-clone: don't get fooled by $PWD
23316 .mailmap: add some aliases
23317 checkout: allow detaching to HEAD even when switching to the tip of a branch
23318 git-config: do not forget seeing "a.b.var" means we are out of "a.var" section.
23319 Fix git-clone buglet for remote case.
23320 Prepare for 1.5.1.5 Release Notes
23323 Marco Costalba (1):
23324 Fix an unmatched comment end in arm/sha1_arm.S
23326 Matthieu Castet (1):
23327 Remove stale non-static-inline prototype for tree_entry_extract()
23329 Michael Hendricks (2):
23330 git-send-email: allow leading white space on mutt aliases
23331 Document core.excludesfile for git-add
23334 Documentation: git-rev-list's "patterns"
23337 RPM spec: include files in technical/ to package.
23338 Documentation/branch: fix small typo in -D example
23340 Richard P. Curnow (2):
23341 Fix documentation of tag in git-fast-import.txt
23342 Fix documentation of tag in git-fast-import.txt
23344 Shawn O. Pearce (1):
23345 Properly handle '0' filenames in import-tars
23347 Steffen Prohaska (3):
23348 tiny fix in documentation of git-clone
23349 git-config: test for 'do not forget "a.b.var" ends "a.var" section'.
23350 Fixed link in user-manual
23353 Version v1.5.1.4; changes since v1.5.1.3:
23354 -----------------------------------------
23357 Small correction in reading of commit headers
23359 Alexandre Julliard (1):
23360 http-fetch: Disable use of curl multi support for libcurl < 7.16.
23362 Amos Waterland (1):
23363 wcwidth redeclaration
23365 Arjen Laarhoven (1):
23366 Document 'opendiff' value in config.txt and git-mergetool.txt
23369 Allow PERL_PATH="/usr/bin/env perl"
23370 posix compatibility for t4200
23373 Mention version 1.5.1 in tutorial and user-manual
23375 Daniel Barkalow (1):
23376 Make xstrndup common
23378 Frank Lichtenheld (1):
23379 cvsserver: Handle re-added files correctly
23381 J. Bruce Fields (7):
23382 user-manual: more discussion of detached heads, fix typos
23383 user-manual: add section ID's
23384 user-manual: clean up fast-forward and dangling-objects sections
23385 user-manual: fix .gitconfig editing examples
23386 user-manual: miscellaneous editing
23387 user-manual: stop deprecating the manual
23388 user-manual: fix clone and fetch typos
23390 Jakub Narebski (1):
23391 diff format documentation: describe raw combined diff format
23394 Documentation: fix typo in git-remote.txt
23397 Documentation: don't reference non-existent 'git-cvsapplycommit'
23399 Johannes Schindelin (1):
23400 Teach import-tars about GNU tar's @LongLink extension.
23402 Junio C Hamano (5):
23403 diff.c: fix "size cache" handling.
23404 blame: Notice a wholesale incorporation of an existing file.
23406 Add test for blame corner cases.
23409 Karl Hasselström (2):
23410 Fix markup in git-svn man page
23411 Add --no-rebase option to git-svn dcommit
23413 Linus Torvalds (1):
23414 Fix --boundary output
23416 Martin Koegler (1):
23417 Fix compilation of test-delta
23419 Paul Mackerras (1):
23420 gitk: Allow user to choose whether to see the diff, old file, or new file
23423 Add howto files to rpm packages.
23425 Shawn O. Pearce (1):
23426 git-gui: Allow spaces in path to 'wish'
23429 gitweb: use decode_utf8 directly
23432 Version v1.5.1.3; changes since v1.5.1.2:
23433 -----------------------------------------
23436 Remove usernames from all commit messages, not just when using svmprops
23437 git-svn: Don't rely on $_ after making a function call
23438 git-svn: Ignore usernames in URLs in find_by_url
23439 git-svn: Added 'find-rev' command
23440 git-svn: Add 'find-rev' command
23443 Fix handle leak in write_tree
23446 Removing -n option from git-diff-files documentation
23447 Document additional options for git-fetch
23448 Update git-fmt-merge documentation
23449 Update git-grep documentation
23450 Update -L documentation for git-blame/git-annotate
23451 Update git-http-push documentation
23452 Update git-local-fetch documentation
23453 Update git-http-fetch documentation
23455 Brian Gernhardt (2):
23456 Reverse the order of -b and --track in the man page.
23457 Ignore all man sections as they are generated files.
23460 Documentation/git-reset.txt: suggest git commit --amend in example.
23463 Clarify SubmittingPatches Checklist
23464 git.7: Mention preformatted html doc location
23465 send-email documentation: clarify --smtp-server
23467 Johannes Schindelin (2):
23468 dir.c(common_prefix): Fix two bugs
23469 import-tars: be nice to wrong directory modes
23472 Fix typo in git-am: s/Was is/Was it/
23473 Create a sysconfdir variable, and use it for ETC_GITCONFIG
23474 Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
23476 Julian Phillips (1):
23477 http.c: Fix problem with repeated calls of http_init
23479 Junio C Hamano (8):
23480 Build RPM with ETC_GITCONFIG=/etc/gitconfig
23481 applymbox & quiltimport: typofix.
23482 Start preparing for 1.5.1.3
23483 Do not barf on too long action description
23484 Update .mailmap with "Michael"
23485 Fix import-tars fix.
23486 Fix symlink handling in git-svn, related to PerlIO
23489 Michele Ballabio (1):
23490 git shortlog documentation: add long options and fix a typo
23492 Robin H. Johnson (10):
23493 Document --dry-run parameter to send-email.
23494 Prefix Dry- to the message status to denote dry-runs.
23495 Debugging cleanup improvements
23496 Change the scope of the $cc variable as it is not needed outside of send_message.
23497 Perform correct quoting of recipient names.
23498 Validate @recipients before using it for sendmail and Net::SMTP.
23499 Ensure clean addresses are always used with Net::SMTP
23500 Allow users to optionally specify their envelope sender.
23501 Document --dry-run and envelope-sender for git-send-email.
23502 Sanitize @to recipients.
23504 Shawn O. Pearce (3):
23505 Actually handle some-low memory conditions
23506 Don't allow empty pathnames in fast-import
23507 Catch empty pathnames in trees during fsck
23510 Version v1.5.1.2; changes since v1.5.1.1:
23511 -----------------------------------------
23514 Use rev-list --reverse in git-rebase.sh
23515 Document -g (--walk-reflogs) option of git-log
23516 Fix overwriting of files when applying contextually independent diffs
23519 Update git-am documentation
23520 Update git-applymbox documentation
23521 Update git-apply documentation
23522 Update git-annotate/git-blame documentation
23523 Update git-archive documentation
23524 Update git-cherry-pick documentation
23525 Fix unmatched emphasis tag in git-tutorial
23526 Update git-config documentation
23528 Andy Whitcroft (1):
23529 fix up strtoul_ui error handling
23532 Use const qualifier for 'sha1' parameter in delete_ref function
23535 git-svn: respect lower bound of -r/--revision when following parent
23536 git-svn: quiet some warnings when run only with --version/--help
23537 git-svn: don't allow globs to match regular files
23538 perl: install private Error.pm if the site version is older than our own
23540 Eygene Ryabinkin (2):
23541 Teach gitk to use the user-defined UI font everywhere.
23542 Improve look-and-feel of the gitk tool.
23544 Frank Lichtenheld (5):
23545 config.txt: Document gitcvs.allbinary
23546 config.txt: Document core.autocrlf
23547 config.txt: Change pserver to server in description of gitcvs.*
23548 config.txt: Fix grammatical error in description of http.noEPSV
23549 git-shortlog: Fix two formatting errors in asciidoc documentation
23552 variable $projectdesc needs to be set before checking against unchanged default.
23553 Have sample update hook not refuse deleting a branch through push.
23555 J. Bruce Fields (7):
23556 Documentation: minor edits of git-lost-found manpage
23557 Documentation: clarify git-checkout -f, minor editing
23558 Documentation: clarify track/no-track option.
23559 user-manual: fix discussion of default clone
23560 user-manual: detached HEAD
23561 user-manual: start revising "internals" chapter
23562 user-manual: use detached head when rewriting history
23565 sscanf/strtoul: parse integers robustly
23567 Junio C Hamano (4):
23568 Do not default to --no-index when given two directories.
23569 Start preparing for 1.5.1.2
23570 git-clone: fix dumb protocol transport to clone from pack-pruned ref
23573 Linus Torvalds (1):
23574 git-quiltimport complaining yet still working
23576 Matthias Lederhofer (1):
23577 handle_options in git wrapper miscounts the options it handled.
23580 git-blame: Fix overrun in fake_working_tree_commit()
23583 git-tar-tree: complete deprecation conversion message
23585 Shawn O. Pearce (1):
23586 git-gui: Brown paper bag fix division by 0 in blame
23589 Version v1.5.1.1; changes since v1.5.1:
23590 ---------------------------------------
23592 Arjen Laarhoven (4):
23593 usermanual.txt: some capitalization nits
23594 t3200-branch.sh: small language nit
23595 t5300-pack-object.sh: portability issue using /usr/bin/stat
23596 Makefile: iconv() on Darwin has the old interface
23598 Brian Gernhardt (3):
23599 Fix t4200-rerere for white-space from "wc -l"
23600 Document --left-right option to rev-list.
23601 Distinguish branches by more than case in tests.
23604 Fix lseek(2) calls with args 2 and 3 swapped
23607 git-svn: bail out on incorrect command-line options
23608 git-svn: dcommit/rebase confused by patches with git-svn-id: lines
23609 git-svn: fix log command to avoid infinite loop on long commit messages
23611 Frank Lichtenheld (7):
23612 cvsimport: sync usage lines with existing options
23613 cvsimport: Improve documentation of CVSROOT and CVS module determination
23614 cvsimport: Improve usage error reporting
23615 cvsimport: Reorder options in documentation for better understanding
23616 cvsimport: Improve formating consistency
23617 cvsserver: small corrections to asciidoc documentation
23618 cvsserver: Fix handling of diappeared files on update
23621 Fix renaming branch without config file
23624 rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email.
23626 Jakub Narebski (1):
23627 gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches
23630 (encode_85, decode_85): Mark source buffer pointer as "const".
23632 Julian Phillips (1):
23633 Documentation: show-ref: document --exclude-existing
23635 Junio C Hamano (7):
23636 rerere: make sorting really stable.
23637 Fix dependency of common-cmds.h
23638 Documentation: tighten dependency for git.{html,txt}
23639 Prepare for 1.5.1.1
23640 Add Documentation/cmd-list.made to .gitignore
23641 fsck: do not complain on detached HEAD.
23645 rename_ref(): only print a warning when config-file update fails
23646 Make builtin-branch.c handle the git config file
23649 Revert "builtin-archive: use RUN_SETUP"
23651 Shawn O. Pearce (1):
23652 Honor -p<n> when applying git diffs
23654 Tomash Brechko (1):
23655 cvsexportcommit -p : fix the usage of git-apply -C.
23658 DESTDIR support for git/contrib/emacs
23660 YOSHIFUJI Hideaki (1):
23661 Avoid composing too long "References" header.
23664 Version v1.5.1; changes since v1.5.1-rc3:
23665 -----------------------------------------
23668 Keep rename/rename conflicts of intermediate merges while doing recursive merge
23671 Reimplement emailing part of hooks--update in contrib/hooks/post-receive-email
23673 Christian Couder (1):
23674 Bisect: Improve error message in "bisect_next_check".
23677 git-mailinfo fixes for patch munging
23680 git-svn: avoid respewing similar error messages for missing paths
23681 git-svn: fail on rebase if we are unable to find a ref to rebase against
23684 git-quiltimport /bin/sh-ism fix
23686 Frank Lichtenheld (1):
23687 cvsserver: Don't lie about binary mode in asciidoc documentation
23690 Documentation/git-svnimport.txt: fix typo.
23691 Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.
23693 H. Peter Anvin (1):
23694 git-upload-pack: make sure we close unused pipe ends
23696 Jakub Narebski (2):
23697 gitweb: Support comparing blobs (files) with different names
23698 Documentation: A few minor fixes to Git User's Manual
23700 Julian Phillips (1):
23701 contrib/workdir: add a simple script to create a working directory
23703 Junio C Hamano (6):
23704 Update draft release notes for 1.5.1
23705 Do not bother documenting fetch--tool
23706 Hopefully final update to the draft Release Notes, preparing for 1.5.1
23707 rerere should not repeat the earlier hunks in later ones
23712 Plug memory leak in index-pack collision checking codepath.
23714 Theodore Ts'o (12):
23715 Fix minor formatting issue in man page for git-mergetool
23716 mergetool: Replace use of "echo -n" with printf(1) to be more portable
23717 mergetool: Don't error out in the merge case where the local file is deleted
23718 mergetool: portability fix: don't assume true is in /bin
23719 mergetool: portability fix: don't use reserved word function
23720 mergetool: factor out common code
23721 mergetool: Remove spurious error message if merge.tool config option not set
23722 mergetool: Fix abort command when resolving symlinks and deleted files
23723 mergetool: Add support for Apple Mac OS X's opendiff command
23724 mergetool: Make git-rm quiet when resolving a deleted file conflict
23725 mergetool: Clean up description of files and prompts for merge resolutions
23726 Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS
23729 Version v1.5.1-rc3; changes since v1.5.1-rc2:
23730 ---------------------------------------------
23732 Alexandre Julliard (1):
23733 git.el: Display some information about the HEAD commit.
23735 Christian Couder (2):
23736 Bisect: Use "git-show-ref --verify" when reseting.
23737 Bisect: add checks at the beginning of "git bisect run".
23740 Makefile: remove test-chmtime program in target clean.
23741 http-fetch: don't use double-slash as directory separator in URLs
23742 http-fetch: remove path_len from struct alt_base, it was computed but never used
23744 H. Peter Anvin (1):
23745 git-upload-pack: make sure we close unused pipe ends
23747 Jakub Narebski (2):
23748 gitweb: Add example of config file and how to generate projects list to gitweb/INSTALL
23749 gitweb: Cleanup and uniquify die_error calls
23752 read-tree: use xcalloc
23753 use xrealloc in help.c
23756 git-rm: don't remove newly added file without -f
23757 --pretty=format: fix broken %ct and %at interpolation
23758 Add some basic tests of rev-list --pretty=format
23759 Fix "--pretty=format:" encoding item
23760 t/t6006: add tests for a slightly more complex commit messages
23761 commit: fix pretty-printing of messages with "\nencoding "
23764 sha1_file.c (write_sha1_from_fd): Detect close failure.
23766 Johannes Schindelin (1):
23767 t4118: be nice to non-GNU sed
23769 Junio C Hamano (7):
23770 Document git-log --first-parent
23771 sha1_file.c (write_sha1_file): Detect close failure
23772 git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly
23773 Fix "--pretty=format:" for parent related items.
23775 Update main git.html page to point at 1.5.0.6 documentation
23778 Linus Torvalds (1):
23779 Fix "getaddrinfo()" buglet
23782 Version v1.5.1-rc2; changes since v1.5.1-rc1:
23783 ---------------------------------------------
23786 Document --quiet option to git-diff
23787 Use diff* with --exit-code in git-am, git-rebase and git-merge-ours
23790 update-hook: abort early if the project description is unset
23791 update-hook: remove e-mail sending hook.
23794 prefer "git COMMAND" over "git-COMMAND" in gitk
23797 make git clone -q suppress the noise with http fetch
23799 Christian Couder (6):
23800 Bisect: implement "git bisect run <cmd>..." to automatically bisect.
23801 Documentation: bisect: reformat some paragraphs.
23802 Documentation: bisect: reword one paragraph.
23803 Documentation: bisect: reformat more paragraphs.
23804 Documentation: bisect: add some titles to some paragraphs.
23805 Documentation: bisect: make a comment fit better in the man page.
23808 gitk: bind <F5> key to Update (reread commits)
23809 git-svn: fix rel_path() when not connected to the repository root
23811 J. Bruce Fields (5):
23812 user-manual: run xsltproc without --nonet option
23813 user-manual: Use def_ instead of ref_ for glossary references.
23814 glossary: stop generating automatically
23815 glossary: clean up cross-references
23816 user-manual: introduce "branch" and "branch head" differently
23818 Jakub Narebski (4):
23819 gitweb: Fix "next" link in commit view
23820 gitweb: Don't escape attributes in CGI.pm HTML methods
23821 gitweb: Fix not marking signoff lines in "log" view
23822 gitweb: Add some installation notes in gitweb/INSTALL
23825 Replace remaining instances of strdup with xstrdup.
23826 use xmalloc in git.c and help.c
23829 user-manual.txt: fix a tiny typo.
23831 Johannes Schindelin (5):
23832 xdiff/xutils.c(xdl_hash_record): factor out whitespace handling
23833 Add a HOWTO for setting up a standalone git daemon
23834 Provide some technical documentation for shallow clones
23835 t4118: be nice to non-GNU sed
23836 git-revert: Revert revert message to old behaviour
23839 Teach git-remote to list pushed branches.
23841 Junio C Hamano (15):
23842 git-log --first-parent: show only the first parent log
23843 blame: micro-optimize cmp_suspect()
23844 blame: cmp_suspect is not "cmp" anymore.
23845 Teach tree_entry_interesting() that the tree entries are sorted.
23846 tree-diff: avoid strncmp()
23847 tree_entry_interesting(): allow it to say "everything is interesting"
23848 git-rebase: make 'rebase HEAD branch' work as expected.
23849 git-apply: Do not free the wrong buffer when we convert the data for writeout
23850 checkout: report where the new HEAD is upon detaching HEAD
23851 git-bisect: typofix
23852 git-bisect.sh: properly dq $GIT_DIR
23853 Fix path-limited "rev-list --bisect" termination condition.
23854 git-am documentation: describe what is taken from where.
23855 Update README to point at a few key periodical messages to the list
23859 gitweb: Change to use explicitly function call cgi->escapHTML()
23861 Linus Torvalds (6):
23862 Fix loose object uncompression check.
23863 Don't ever return corrupt objects from "parse_object()"
23864 Be more careful about zlib return values
23865 Remove "pathlen" from "struct name_entry"
23866 Initialize tree descriptors with a helper function rather than by hand.
23867 Switch over tree descriptors to contain a pre-parsed entry
23869 Michael S. Tsirkin (2):
23870 fix typo in git-am manpage
23871 git-merge: Put FETCH_HEAD data in merge commit message
23873 Nicolas Pitre (10):
23874 clean up the delta base cache size a bit
23875 use a LRU eviction policy for the delta base cache
23876 don't ever allow SHA1 collisions to exist by fetching a pack
23877 index-pack: use hash_sha1_file()
23878 index-pack: more validation checks and cleanups
23879 improve checkout message when asking for same branch
23880 minor git-prune optimization
23881 update HEAD reflog when branch pointed to by HEAD is directly modified
23882 make it more obvious that temporary files are temporary files
23883 write_sha1_from_fd() should make new objects read-only
23886 Documentation/pack-format.txt: Clear up description of types.
23889 git-fetch: Fix single_force in append_fetch_head
23891 Shawn O. Pearce (1):
23892 contrib/continuous: a continuous integration build manager
23894 Uwe Kleine-König (1):
23895 Bisect: convert revs given to good and bad to commits
23898 Version v1.5.1-rc1; changes since v1.5.0.7:
23899 -------------------------------------------
23902 disable t4016-diff-quote.sh on some filesystems
23903 git-gui: Support of "make -s" in: do not output anything of the build itself
23904 More build output cleaning up
23905 Support of "make -s": do not output anything of the build itself
23906 Allow "make -w" generate its usual output
23907 Allow git-diff exit with codes similar to diff(1)
23908 Add tests for --quiet option of diff programs
23910 Alexandre Julliard (1):
23911 git.el: Add support for commit hooks.
23914 Only show log entries for new revisions in hooks--update
23915 Have git-cvsserver call hooks/update before really altering the ref
23916 The "table-of-contents" in the update hook script should match the body
23917 cvsserver: Remove trailing "\n" from commithash in checkin function
23918 cvsserver: Make always-binary mode a config file option
23919 Sample update hook: typofix and modernization to use "git log"
23920 update-hook: fix incorrect use of git-describe and sed for finding previous tag
23922 Aneesh Kumar K.V (1):
23923 Documentation: document remote.<name>.tagopt
23926 git-send-email: configurable bcc and chain-reply-to
23929 builtin-mailinfo.c infrastrcture changes
23930 restrict the patch filtering
23931 Add a couple more test cases to the suite.
23934 git-svn: move authentication prompts into their own namespace
23935 git-svn: cleanup: move process_rm around
23936 git-svn: cleanup: put SVN workarounds into their own namespace
23937 git-svn: cleanup: avoid re-use()ing Git.pm in sub-packages
23938 git-svn: add Git::SVN module (to avoid global variables)
23939 git-svn: convert 'init' to use Git::SVN
23940 git-svn: convert multi-init over to using Git::SVN
23941 git-svn: make multi-init capable of reusing the Ra connection
23942 git-svn: add a test for show-ignore
23943 git-svn: convert show-ignore over to Git::SVN
23944 git-svn: moved the 'log' command into its own namespace
23945 git-svn: port the 'rebuild' command to use Git::SVN objects
23946 git-svn: do not let Git.pm warn if we prematurely close pipes
23947 git-svn: convert the 'commit-diff' command to Git::SVN
23948 git-svn: get rid of Memoize for now...
23949 git-svn: fetch/multi-fetch converted over to Git::SVN module
23950 git-svn: switch dcommit to using Git::SVN code
23951 git-svn: convert 'set-tree' command to use Git::SVN
23952 git-svn: remove graft-branches command
23953 git-svn: add support for metadata in .git/config
23954 git-svn: fix a regression in dcommit that caused empty log messages
23955 git-svn: reuse open SVN::Ra connections by URL
23956 git-svn: enable --minimize to simplify the config and connections
23957 git-svn: fix --follow-parent to work with Git::SVN
23958 git-svn: --follow-parent works with svn-remotes multiple branches
23959 git-svn: disallow ambigious local refspecs
23960 git-svn: allow --follow-parent on deleted directories
23961 git-svn: get rid of additional fetch-arguments
23962 git-svn: allow 'init' to work outside of tests
23963 git-svn: better error reporting if --follow-parent fails
23964 git-svn: 'init' attempts to connect to the repository root if possible
23965 git-svn: --follow-parent now works on sub-directories of larger branches
23966 git-svn: track writes writes to the index in fetch
23967 git-svn: add an odd test case that seems to cause segfaults over HTTP
23968 git-svn: avoid tracking change-less revisions
23969 git-svn: correctly track revisions made to deleted branches
23970 git-svn: fix segfaults from accessing svn_log_changed_path_t
23971 git-svn: fix committing to subdirectories, add tests
23972 git-svn: avoid an extra svn_ra connection during commits
23973 git-svn: simplify usage of the SVN::Git::Editor interface
23974 git-svn: cleanup remove unused function
23975 git-svn: allow multi-fetch to fetch things chronologically
23976 git-svn: correctly track diff-less copies with do_switch
23977 git-svn: correctly handle do_{switch,update} in deep directories
23978 git-svn: stop using path names as refnames with --follow-parent
23979 git-svn: cleanup: move editor-specific variables into the editor namespace
23980 git-svn: just use Digest::MD5 instead of requiring it
23981 git-svn: reinstate the default SVN error handler after using get_log
23982 git-svn: don't rely on do_switch + reparenting with svn(+ssh)://
23983 git-svn: fetch tracks initial change with --follow-parent
23984 git-svn: remove the 'rebuild' command and make the functionality automatic
23985 git-svn: fix several fetch bugs related to repeated invocations
23986 git-svn: reinstate --no-metadata, add --svn-remote=, variable cleanups
23987 git-svn: gracefully handle --follow-parent failures
23988 git-svn: make (multi-)fetch safer but slower
23989 git-svn: avoid a huge memory spike with high-numbered revisions
23990 git-svn: re-enable repacking flags
23991 git-svn: do our best to ensure that our ref and rev_db are consistent
23992 git-svn: avoid redundant get_log calls between invocations
23993 git-svn: use sys* IO functions for reading rev_db
23994 git-svn: don't write to the config file from --follow-parent
23995 git-svn: save paths to tags/branches with for future reuse
23996 git-svn: migrations default to [svn-remote "git-svn"]
23997 git-svn: get rid of revisions_eq check for --follow-parent
23998 git-svn: avoid extra get_log calls when refspecs are added for fetching
23999 git-svn: just name the default svn-remote "svn" instead of "git-svn"
24000 git-svn: prepare multi-init for wildcard support
24001 git-svn: reintroduce using a single get_log() to fetch
24002 git-svn: run get_log() on a sub-directory if possible
24003 git-svn: implement auto-discovery of branches/tags
24004 git-svn: --follow-parent tracks multi-parent paths
24005 git-svn: remove check_path calls before calling do_update
24006 git-svn: remove some noisy debugging messages
24007 git-svn: enable follow-parent functionality by default
24008 git-svn: fix buggy regular expression usage in several places
24009 git-svn: correctly handle the -q flag in SVN::Git::Fetcher
24010 git-svn: correctly handle globs with a right-hand-side path component
24011 git-svn: remove optimized commit stuff for set-tree
24012 git-svn: add support for SVN::Mirror/svk using revprops for metadata
24013 git-svn: add support for per-[svn-remote "..."] options
24014 git-svn: use private $GIT_DIR/svn/config file more
24015 git-svn: extra safety for noMetadata and useSvmProps users
24016 git-svn: use separate, per-repository .rev_db files
24017 git-svn: write the highest maxRex out for branches and tags
24018 git-svn: handle multi-init without --trunk, UseSvmProps fixes
24019 git-svn: make dcommit usable for glob users
24020 git-svn: include merges when calling rev-list for decommit
24021 git-svn: usability fixes for the 'git svn log' command
24022 t910*: s/repo-config/config/g; poke around possible race conditions
24023 git-svn: hopefully make 'fetch' more user-friendly
24024 git-svn: allow 'init' to act as multi-init
24025 git-svn: brown paper bag fixes
24026 git-svn: simplify the (multi-)init methods of fetching
24027 git-svn: allow --log-window-size to be specified, default to 100
24028 git-svn: remember to check for clean indices on globbed refs, too
24029 git-svn: error checking for invalid [svn-remote "..."] sections
24030 git-svn: allow dcommit for those who only fetch from SVM with useSvmProps
24031 git-svn: documentation updates for new functionality
24032 git-svn: add support for --stat in the log command
24033 git-svn: checkout files on new fetches
24034 git-svn: add a 'rebase' command
24035 git-svn: fix some issues for people migrating from older versions
24036 git-svn: hide the private git-svn 'config' file as '.metadata'
24037 git-svn: add 'clone' command, an alias for init + fetch
24038 git-svn: allow overriding of the SVN repo root in metadata
24039 git-svn: add support for using svnsync properties
24040 git-svn: fix useSvmProps, hopefully for the last time
24041 git-svn: add test for useSvnsyncProps
24042 git-svn: documentation updates
24043 git-svn: allow metadata options to be specified with 'init' and 'clone'
24044 git-svn: give show-ignore HEAD smarts, like dcommit and log
24045 git-svn: ensure we're at the top-level and can access $GIT_DIR
24046 git-svn: fix clone when a target directory has been specified
24047 git-svn: fix reconnections to different paths of svn:// repositories
24048 git-svn: fix some potential bugs with --follow-parent
24049 Add test-chmtime: a utility to change mtime on files
24050 Update tests to use test-chmtime
24051 git-svn: fix show-ignore when not connected to the repository root
24052 git-svn: add -l/--local command to "git svn rebase"
24054 Frank Lichtenheld (3):
24055 cvsserver: Use Merged response instead of Update-existing for merged files
24056 cvsserver: Be more chatty
24057 cvsserver: further improve messages on commit and status
24059 Fredrik Kuivinen (1):
24060 New autoconf test for iconv
24062 J. Bruce Fields (1):
24063 Make git-send-email aware of Cc: lines.
24065 Jakub Narebski (1):
24066 gitweb: Don't escape attributes in CGI.pm HTML methods
24069 add: Support specifying an excludes file with a configuration variable
24071 mergetool: Add support for vimdiff.
24074 New fast-import test case for valid tree sorting
24077 I like the idea of the new ':/<oneline prefix>' notation, and gave it a try, but all I could get was a segfault. It was dereferencing a NULL commit list. Fix below. With it, this example now works:
24078 git-grep: don't use sscanf
24080 Johannes Schindelin (42):
24081 Teach revision machinery about --reverse
24082 teach diff machinery about --ignore-space-at-eol
24083 name-rev: introduce the --refs=<pattern> option
24084 diff --check: use colour
24085 apply: fix memory leak in prefix_one()
24086 name-rev: avoid "^0" when unneeded
24087 rev-list --max-age, --max-count: support --boundary
24088 fetch & clone: do not output progress when not on a tty
24089 config: read system-wide defaults from /etc/gitconfig
24090 git grep: use pager
24091 Teach diff -B about colours
24092 apply: make --verbose a little more useful
24093 Teach git-diff-files the new option `--no-index`
24094 pretty-formats: add 'format:<string>'
24095 Make tests independent of global config files
24096 Add git-bundle: move objects and references by archive
24097 git-bundle: assorted fixes
24098 git-bundle: avoid fork() in verify_bundle()
24099 git-bundle: fix 'create --all'
24100 git-bundle: record commit summary in the prerequisite data
24101 Fixup no-progress for fetch & clone
24102 object name: introduce ':/<oneline prefix>' notation
24103 Fix typo: do not show name1 when name2 fails
24104 diff --no-index: also imitate the exit status of diff(1)
24105 Actually make print_wrapped_text() useful
24106 show_date(): rename the "relative" parameter to "mode"
24107 diff: make more cases implicit --no-index
24108 print_wrapped_text: fix output for negative indent
24109 Make git-revert & git-cherry-pick a builtin
24110 diff: support reading a file from stdin via "-"
24111 diff --no-index: support /dev/null as filename
24112 Get rid of the dependency to GNU diff in the tests
24113 cherry-pick: Suggest a better method to retain authorship
24114 format-patch: add --inline option and make --attach a true attachment
24115 bundle: fix wrong check of read_header()'s return value & add tests
24116 git-bundle: avoid packing objects which are in the prerequisites
24117 git-bundle: Make thin packs
24118 git-bundle: handle thin packs in subcommand "unbundle"
24119 git-bundle: die if a given ref is not included in bundle
24120 git-bundle: prevent overwriting existing bundles
24121 git-bundle: only die if pack would be empty, warn if ref is skipped
24122 Do not output "GEN " when generating perl.mak
24125 Add core.symlinks to mark filesystems that do not support symbolic links.
24126 Handle core.symlinks=false case in merge-recursive.
24127 Tell multi-parent diff about core.symlinks.
24129 Julian Phillips (5):
24130 Allow fetch--tool to read from stdin
24131 Use stdin reflist passing in parse-remote
24132 Use stdin reflist passing in git-fetch.sh
24133 git-branch: improve abbreviation of sha1s in verbose mode
24134 git-branch: document new --no-abbrev option
24136 Junio C Hamano (80):
24137 git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2)
24138 Make merge-base a built-in.
24139 Allow in_merge_bases() to take more than one reference commits.
24140 Remove git-resolve.
24141 Remove git-diff-stages.
24142 Add link to v1.5.0 documentation.
24143 blame: --show-stats for easier optimization work.
24144 git-fetch: split fetch_main into fetch_dumb and fetch_native
24145 git-fetch--tool: start rewriting parts of git-fetch in C.
24146 git-fetch: move more code into C.
24147 git-fetch: rewrite another shell loop in C
24148 git-fetch: rewrite expand_ref_wildcard in C
24149 Document --ignore-space-at-eol option.
24151 Point top-level RelNotes link at 1.5.1 release notes being prepared.
24152 t0020: add test for auto-crlf
24153 remotes.not-origin.tagopt
24154 Teach 'git apply' to look at $GIT_DIR/config
24155 Teach core.autocrlf to 'git apply'
24156 Update draft release notes for 1.5.1
24157 Teach 'git apply' to look at $HOME/.gitconfig even outside of a repository
24158 git-apply: do not lose cwd when run from a subdirectory.
24159 git-apply: require -p<n> when working in a subdirectory.
24160 Link 1.5.0.1 documentation from the main page.
24162 Mechanical conversion to use prefixcmp()
24163 prefixcmp(): fix-up mechanical conversion.
24164 prefixcmp(): fix-up leftover strncmp().
24165 t4119: add test for traditional patch and different p_value
24166 Fix botched "leak fix"
24167 git-apply: notice "diff --git" patch again
24168 git-apply: guess correct -p<n> value for non-git patches.
24169 t4119: test autocomputing -p<n> for traditional diff input.
24170 git-status: do not be totally useless in a read-only repository.
24171 update-index: do not die too early in a read-only repository.
24172 run_diff_{files,index}(): update calling convention.
24173 .mailmap maintenance after pulling from git-svn
24174 bundle: reword missing prerequisite error message
24175 git-fetch--tool takes flags before the subcommand.
24176 diff --cached: give more sensible error message when HEAD is yet to be created.
24177 Documentation: link in 1.5.0.2 material to the top documentation page.
24178 builtin-fetch--tool: adjust to updated sha1_object_info().
24179 Make 'cvs ci' lockless in git-cvsserver by using git-update-ref
24180 fetch--tool: fix uninitialized buffer when reading from stdin
24181 builtin-fetch--tool: make sure not to overstep ls-remote-result buffer.
24182 index_fd(): use enum object_type instead of type name string.
24183 index_fd(): pass optional path parameter as hint for blob conversion
24184 index_fd(): convert blob only if it is a regular file.
24185 Add recent changes to draft 1.5.1 release notes.
24186 git-fetch: retire update-local-ref which is not used anymore.
24187 builtin-fetch--tool: fix reflog notes.
24188 diff-ni: allow running from a subdirectory.
24189 diff-ni: fix the diff with standard input
24190 .gitignore: add git-fetch--tool
24191 format-patch --attach: not folding some long headers.
24192 Post 1.5.0.3 cleanup
24193 fsck: fix broken loose object check.
24194 unpack_sha1_file(): detect corrupt loose object files.
24195 fsck: exit with non-zero status upon errors
24196 git-bundle: fix pack generation.
24197 revision walker: Fix --boundary when limited
24198 revision traversal: retire BOUNDARY_SHOW
24199 git-bundle: various fixups
24200 revision traversal: SHOWN means shown
24201 git-bundle: make verify a bit more chatty.
24202 revision --boundary: fix stupid typo
24203 revision --boundary: fix uncounted case.
24204 Fix broken create_branch() in builtin-branch.
24205 prepare_packed_git(): sort packs by age and localness.
24206 Documentation: add git-mergetool to the command list.
24207 shortlog: prompt when reading from terminal by mistake
24208 Remove unused diffcore_std_no_resolve
24210 Teach --quiet to diff backends.
24211 revision.c: explain what tree_difference does
24212 try-to-simplify-commit: use diff-tree --quiet machinery.
24213 applymbox: brown paper bag fix.
24214 Update main git.html page to point at 1.5.0.5 documentation
24219 gitweb: Change to use explicitly function call cgi->escapHTML()
24221 Linus Torvalds (8):
24222 Lazy man's auto-CRLF
24223 Make AutoCRLF ternary variable.
24224 Re-fix get_sha1_oneline()
24225 Make trivial wrapper functions around delta base generation and freeing
24226 Implement a simple delta_base cache
24227 Avoid unnecessary strlen() calls
24228 Trivial cleanup of track_tree_refs()
24229 Set up for better tree diff optimizations
24232 Support for large files on 32bit systems.
24234 Michael Coleman (2):
24235 git-send-email: abort/usage on bad option
24236 fix various doc typos
24238 Nicolas Pitre (12):
24239 sha1_file.c: cleanup hdr usage
24240 sha1_file.c: cleanup "offset" usage
24241 sha1_file.c: don't ignore an error condition in sha1_loose_object_info()
24242 formalize typename(), and add its reverse type_from_string()
24243 convert object type handling from a string to a number
24244 get rid of lookup_object_type()
24245 make sure enum object_type is signed
24246 local-fetch.c: some error printing cleanup
24247 fix t5300-pack-object.sh
24248 add test for OFS_DELTA objects
24249 clean up pack index handling a bit
24250 Reuse cached data out of delta base cache.
24253 git-config: document --rename-section, provide --remove-section
24254 git-archimport: allow remapping branch names
24255 git-commit: add a --interactive option
24256 git-branch, git-checkout: autosetup for remote branch tracking
24257 git-fetch, git-branch: Support local --track via a special remote '.'
24260 git-remote: support remotes with a dot in the name
24263 git-svn: make test for SVK mirror path import
24264 git-svn: don't consider SVN URL usernames significant when comparing
24265 git-svn: document --username
24268 t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch
24269 t/t5515-fetch-merge-logic.sh: Add two more tests
24272 Documentation/git-svn.txt: Fix formatting errors
24274 Shawn O. Pearce (43):
24275 Cleanup check_valid in commit-tree.
24276 cherry-pick: Bug fix 'cherry picked from' message.
24277 Make 'make' quieter while building git
24278 Make 'make' quiet by default
24279 Display the null SHA-1 as the base for an OBJ_OFS_DELTA.
24280 Fix mmap leak caused by reading bad indexes.
24281 Don't build external_grep if its not used
24282 General const correctness fixes
24283 Use uint32_t for all packed object counts.
24284 Use uint32_t for pack-objects counters.
24285 Use off_t when we really mean a file offset.
24286 Use off_t in pack-objects/fast-import when we mean an offset
24287 Cast 64 bit off_t to 32 bit size_t
24288 Preallocate memory earlier in fast-import
24289 Move post-update hook to after all other activity
24290 Don't run post-update hook unless a ref changed
24291 Refactor run_update_hook to be more useful
24292 Refactor handling of error_string in receive-pack
24293 Teach receive-pack to run pre-receive/post-receive hooks
24294 Use atomic updates to the fast-import mark file
24295 Allow fast-import frontends to reload the marks table
24296 Switch to run_command_v_opt in revert
24297 Remove unused run_command variants
24298 Start defining a more sophisticated run_command
24299 Split run_command into two halves (start/finish)
24300 Teach run_command how to setup a stdin pipe
24301 Refactor run_command error handling in receive-pack
24302 Split back out update_hook handling in receive-pack
24303 Change {pre,post}-receive hooks to use stdin
24304 Remove unnecessary casts from fast-import
24305 Simplify closing two fds at once in run-command.c
24306 Fix t5510-fetch's use of sed
24307 Teach run-command about stdout redirection
24308 Teach run-command to redirect stdout to /dev/null
24309 Replace fork_with_pipe in bundle with run_command
24310 Correct new compiler warnings in builtin-revert
24311 Use RUN_GIT_CMD to run push backends
24312 Use run_command for proxy connections
24313 Use run_command within merge-index
24314 Use run_command within receive-pack to invoke index-pack
24315 Use run_command within send-pack
24317 Limit the size of the new delta_base_cache
24319 Simon 'corecode' Schubert (1):
24320 Allow passing of an alternative CVSROOT via -d.
24323 Teach git-remote to update existing remotes by fetching from them
24324 Add config_boolean() method to the Git perl module
24325 Allow git-remote to update named groups of remotes
24326 Add git-mergetool to run an appropriate merge conflict resolution program
24327 mergetool: print an appropriate warning if merge.tool is unknown
24329 Xavier Maillard (1):
24330 contrib/emacs: Use non-interactive function to byte-compile files
24333 Version v1.5.0.7; changes since v1.5.0.6:
24334 -----------------------------------------
24337 Documentation/git-svnimport.txt: fix typo.
24338 Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.
24340 H. Peter Anvin (1):
24341 git-upload-pack: make sure we close unused pipe ends
24343 Junio C Hamano (2):
24344 rerere should not repeat the earlier hunks in later ones
24348 Version v1.5.0.6; changes since v1.5.0.5:
24349 -----------------------------------------
24351 J. Bruce Fields (5):
24352 user-manual: run xsltproc without --nonet option
24353 user-manual: Use def_ instead of ref_ for glossary references.
24354 glossary: stop generating automatically
24355 glossary: clean up cross-references
24356 user-manual: introduce "branch" and "branch head" differently
24358 Jakub Narebski (4):
24359 gitweb: Fix "next" link in commit view
24360 gitweb: Don't escape attributes in CGI.pm HTML methods
24361 gitweb: Fix not marking signoff lines in "log" view
24362 gitweb: Add some installation notes in gitweb/INSTALL
24365 commit: fix pretty-printing of messages with "\nencoding "
24368 user-manual.txt: fix a tiny typo.
24370 Johannes Schindelin (1):
24371 t4118: be nice to non-GNU sed
24373 Junio C Hamano (2):
24374 git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly
24378 gitweb: Change to use explicitly function call cgi->escapHTML()
24380 Michael S. Tsirkin (1):
24381 fix typo in git-am manpage
24384 Documentation/pack-format.txt: Clear up description of types.
24387 Version v1.5.0.5; changes since v1.5.0.4:
24388 -----------------------------------------
24390 Junio C Hamano (1):
24394 git-merge: finish when git-read-tree fails
24397 Version v1.5.0.4; changes since v1.5.0.3:
24398 -----------------------------------------
24400 Alexandre Julliard (2):
24401 git.el: Avoid appending a signoff line that is already present.
24402 git.el: Retrieve commit log information from .dotest directory.
24405 git-send-email: Document configuration options
24407 Brian Gernhardt (1):
24408 Fix diff-options references in git-diff and git-format-patch
24410 Frank Lichtenheld (1):
24411 cvsserver: asciidoc formatting changes
24413 J. Bruce Fields (7):
24414 glossary: fix overoptimistic automatic linking of defined terms
24415 user-manual: fix inconsistent example
24416 user-manual: fix inconsistent use of pull and merge
24417 user-manual: fix missing colon in git-show example
24418 user-manual: fix rendering of history diagrams
24419 user-manual: install user manual stylesheet with other web documents
24420 git-merge: warn when -m provided on a fast forward
24423 Documentation: s/seperator/separator/
24424 fast-import: grow tree storage more aggressively
24426 Johannes Schindelin (2):
24427 Begin SubmittingPatches with a check list
24428 make t8001 work on Mac OS X again
24430 Junio C Hamano (3):
24431 git-commit: cd to top before showing the final stat
24432 git-checkout: fix "eval" used for merge labelling.
24435 Matthias Kestenholz (1):
24436 Adjust reflog filemode in shared repository
24438 Matthias Lederhofer (1):
24439 setup_git_directory_gently: fix off-by-one error
24441 Shawn O. Pearce (13):
24442 git-gui: Relocate the menu/transport menu code.
24443 git-gui: Add Reset to the Branch menu.
24444 git-gui: Don't create empty (same tree as parent) commits.
24445 git-gui: Remove unnecessary /dev/null redirection.
24446 fast-import: Avoid infinite loop after reset
24447 fast-import: Fail if a non-existant commit is used for merge
24448 git-gui: Make 'make' quieter by default
24449 Catch write_ref_sha1 failure in receive-pack
24450 git-gui: Allow committing empty merges
24451 git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed." This reverts commit 92446aba47b0e0db28f7b858ea387efcca30ab44.
24452 git-gui: Revert "git-gui: Display all authors of git-gui." This reverts commit 871f4c97ad7e021d1a0a98c80c5da77fcf70e4af.
24453 git-gui: Allow 'git gui version' outside of a repository
24454 Don't package the git-gui credits file anymore
24457 Add definition of <commit-ish> to the main git man page.
24460 Clarify doc for git-config --unset-all.
24463 Version v1.5.0.3; changes since v1.5.0.2:
24464 -----------------------------------------
24466 Alexandre Julliard (1):
24467 git.el: Set the default commit coding system from the repository config.
24469 Aneesh Kumar K.V (1):
24470 blameview: Fix the browse behavior in blameview
24472 Christian Schlotter (1):
24473 Documentation: Correct minor typo in git-add documentation.
24475 Eygene Ryabinkin (2):
24476 http-push.c::lock_remote(): validate all remote refs.
24477 Another memory overrun in http-push.c
24480 git-cvsexportcommit: don't cleanup .msg if not yet committed to cvs.
24481 Fix quoting in update hook template
24483 J. Bruce Fields (6):
24484 Documentation: mention module option to git-cvsimport
24485 user-manual: reset to ORIG_HEAD not HEAD to undo merge
24486 user-manual: ensure generated manual references stylesheet
24487 user-manual: insert earlier of mention content-addressable architecture
24488 user-manual: how to replace commits older than most recent
24489 user-manual: more detailed merge discussion
24492 diff --cc: integer overflow given a 2GB-or-larger file
24494 Johannes Schindelin (3):
24495 fetch.o depends on the headers, too.
24496 builtin-archive: use RUN_SETUP
24497 Document the config variable format.suffix
24499 Junio C Hamano (5):
24500 git-apply: do not fix whitespaces on context lines.
24501 Documentation: git-remote add [-t <branch>] [-m <branch>] [-f] name url
24502 Start preparing Release Notes for 1.5.0.3
24503 git-merge: fail correctly when we cannot fast forward.
24506 Linus Torvalds (2):
24507 mailinfo: do not get confused with logical lines that are too long.
24508 git-show: Reject native ref
24510 Matthias Kestenholz (1):
24511 Fix git-gc usage note
24513 Michael Coleman (2):
24514 Fix minor typos/grammar in user-manual.txt
24515 builtin-fmt-merge-msg: fix bugs in --file option
24518 Correct ordering in git-cvsimport's option documentation
24521 git-archimport: support empty summaries, put summary on a single line.
24523 Ramsay Allan Jones (5):
24524 Fix a "label defined but unreferenced" warning.
24525 Fix an "implicit function definition" warning.
24526 Fix some "comparison is always true/false" warnings.
24527 Fix a "pointer type missmatch" warning.
24528 Unset NO_C99_FORMAT on Cygwin.
24531 Documentation/build-docdep.perl: Fix dependencies for included asciidoc files
24532 Documentation/git-quiltimport.txt: Fix labeled list formatting
24533 Documentation/git-send-email.txt: Fix labeled list formatting
24535 Shawn O. Pearce (1):
24536 index-pack: Loop over pread until data loading is complete.
24539 Fix git-show man page formatting in the EXAMPLES section
24541 Uwe Kleine-König (1):
24542 Include config.mak in doc/Makefile
24545 glossary: Add definitions for dangling and unreachable objects
24548 Version v1.5.0.2; changes since v1.5.0.1:
24549 -----------------------------------------
24551 Christian Schlotter (1):
24552 git-clone: Sync documentation to usage note.
24554 Dmitry V. Levin (1):
24555 git-show-ref --verify: Fail if called without a reference
24557 Fredrik Kuivinen (1):
24558 Fix 'git commit -a' in a newly initialized repository
24561 Add a compat/strtoumax.c for Solaris 8.
24562 Obey NO_C99_FORMAT in fast-import.c.
24563 Check for PRIuMAX rather than NO_C99_FORMAT in fast-import.c.
24565 Johannes Schindelin (1):
24566 git-diff: fix combined diff
24568 Junio C Hamano (11):
24569 Reword git-am 3-way fallback failure message.
24570 diff-patch: Avoid emitting double-slashes in textual patch.
24571 Don't modify CREDITS-FILE if it hasn't changed.
24572 rerere: do not skip two conflicted paths next to each other.
24573 rerere: do not deal with symlinks.
24574 Add Release Notes to prepare for 1.5.0.2
24575 merge-index: fix longstanding bug in merging symlinks
24576 merge-recursive: fix longstanding bug in merging symlinks
24577 diff --cc: fix display of symlink conflicts during a merge.
24578 Documentation: describe "-f/-t/-m" options to "git-remote add"
24581 Martin Koegler (1):
24582 git-gui: Create new branches from a tag.
24584 Michael Loeffler (1):
24585 Use gunzip -c over gzcat in import-tars example.
24588 git-remote: support remotes with a dot in the name
24590 Robin Rosenberg (1):
24591 Limit filename for format-patch
24594 Allow arbitrary number of arguments to git-pack-objects
24597 core.legacyheaders: Use the description used in RelNotes-1.5.0
24599 Shawn O. Pearce (16):
24600 git-gui: Refactor 'exec git subcmd' idiom.
24601 git-gui: Basic version check to ensure git 1.5.0 or later is used.
24602 git-gui: Permit merging tags into the current branch.
24603 git-gui: More consistently display the application name.
24604 git-gui: Print version on the console.
24605 git-gui: Prefer version file over git-describe.
24606 git-gui: Expose the browser as a subcommand.
24607 git-gui: Correct crash when saving options in blame mode.
24608 git-gui: Use mixed path for docs on Cygwin.
24609 git-gui: Display all authors of git-gui.
24610 git-gui: Change summary of git-gui.
24611 git-gui: Include browser in our usage message.
24612 git-gui: Remove TODO list.
24613 git-gui: Don't crash in citool mode on initial commit.
24614 Document the new core.bare configuration option.
24615 Include git-gui credits file in dist.
24618 Version v1.5.0.1; changes since v1.5.0:
24619 ---------------------------------------
24621 Alexandre Julliard (2):
24622 git-daemon: Avoid leaking the listening sockets into child processes.
24623 sha1_file.c: Round the mmap offset to half the window size.
24625 Fredrik Kuivinen (2):
24626 Read the config in rev-list
24627 Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding
24629 Junio C Hamano (15):
24630 Documentation: Drop full-stop from git-fast-import title.
24631 cmd-list: add git-remote
24632 Makefile: update check-docs target
24633 Clarify two backward incompatible repository options.
24634 Still updating 1.5.0 release notes.
24635 Add RelNotes 1.5.0.1
24636 Make sure packedgitwindowsize is multiple of (pagesize * 2)
24637 Make gitk work reasonably well on Cygwin.
24638 gitk: Use show-ref instead of ls-remote
24639 GIT-VERSION-FILE: check ./version first.
24640 pretend-sha1: grave bugfix.
24641 git-merge: minor fix for no_trivial_merge_strategies.
24642 Do not take mode bits from index after type change.
24643 Update draft release notes for 1.5.0.1
24647 gitk - remove trailing whitespace from a few lines.
24648 Make gitk save and restore the user set window position.
24649 Make gitk save and restore window pane position on Linux and Cygwin.
24652 Minor corrections to release notes
24654 Paul Mackerras (1):
24655 Change git repo-config to git config
24657 Shawn O. Pearce (2):
24658 Attempt to improve git-rebase lead-in description.
24659 Convert update-index references in docs to add.
24662 git-blame: prevent argument parsing segfault
24665 Version v1.5.0; changes since v1.5.0-rc4:
24666 -----------------------------------------
24668 Alexandre Julliard (3):
24669 diff.c: Reuse the pprint_rename function for diff --summary output.
24670 diff.c: Properly quote file names in diff --summary output.
24671 diff.c: More logical file name quoting for renames in diffstat.
24674 git-gui: fix typo in GIT-VERSION-GEN, "/dev/null" not "/devnull"
24675 Fix potential command line overflow in hooks--update
24677 Aneesh Kumar K.V (1):
24678 blameview: Move the commit info to a pane below the blame window.
24681 Handle uncommitted changes and cache descriptions
24682 git-blame.el: improve color handling
24683 git-blame.el: blame unsaved changes
24684 git-blame.el: Doc fixes and cleanup
24685 git-blame.el: Autoupdate while editing
24688 Make it easier to override path to asciidoc command
24691 git-svn: correctly handle boolean options via git-config
24693 Jakub Narebski (2):
24694 git-blame: Add Emacs Lisp file headers and GNU GPL boilerplate
24695 git-blame: Change installation instructions
24698 Read cvsimport options from repo-config
24700 Johannes Schindelin (5):
24701 for_each_reflog_ent: be forgiving about missing message
24702 log --reflog: honour --relative-date
24703 format-patch -n: make sorting easier by padding number
24704 log --reflog: use dwim_log
24705 git-gc: run pack-refs by default unless the repo is bare
24707 Junio C Hamano (17):
24708 create_symref(): create leading directories as needed.
24709 reflog: handle $name => remotes/%s/HEAD mapping consistently for logs
24710 Documentation/git-pull: describe default behaviour and config interactions
24711 git-fetch: document automatic tag following.
24712 wt_status_prepare(): clean up structure initialization.
24713 diff_flush_name(): take struct diff_options parameter.
24714 t4016: test quoting funny pathnames in diff output
24715 Documentation: git-rebase -C<n>
24716 Teach git-am to pass -p option down to git-apply
24717 Add discussion section to git-tag documentation.
24718 Add RPM target for git-gui
24719 Do not forget to pack objects reachable from HEAD reflog.
24720 for-each-reflog: not having $GIT_DIR/logs directory is not an error.
24721 "git-fetch --tags $URL" should not overwrite existing tags
24722 Documentation: Moving out of detached HEAD does not warn anymore.
24723 Add release notes to the distribution.
24726 Linus Torvalds (2):
24728 Mark places that need blob munging later for CRLF conversion.
24731 Make gitk save and restore the user set window position.
24732 Make gitk save and restore window pane position on Linux and Cygwin.
24734 Matthias Lederhofer (1):
24735 git merge documentation: -m is optional
24737 Michael Loeffler (1):
24738 import-tars: brown paper bag fix for file mode.
24740 Michael S. Tsirkin (3):
24741 Update git-log and git-show documentation
24742 add -C[NUM] to git-am
24743 Document that git-am can read standard input.
24746 Work around Subversion race in git-svn tests.
24749 Fixed some typos in git-repack docs
24752 remove mailmap.linux
24753 Update RPM core package description
24756 Clarify that git-update-server-info should be run for every git-push
24759 Avoid ugly linewrap in git help
24761 Shawn O. Pearce (313):
24762 git-gui: Initial revision.
24763 git-gui: Additional early feature development.
24764 git-gui: Fixed UI layout problems on Windows.
24765 git-gui: Corrected keyboard bindings on Windows, improved state management.
24766 git-gui: Verify we should actually perform a commit when asked to do so.
24767 git-gui: Finished commit implementation.
24768 git-gui: Implemented amended commits.
24769 git-gui: Misc. nit type of bug fixes.
24770 git-gui: Started construction of fetch and push operations.
24771 git-gui: Worked around environment variable problems on Windows.
24772 git-gui: Reorganized startup procedure to ensure gitdir is right.
24773 git-gui: Fix menu item accelerator display on Mac OS X.
24774 git-gui: Correctly handle CR vs. LF within the console of fetch.
24775 git-gui: Check for fetch or push command failure and denote it.
24776 git-gui: Don't complain if no .git/remotes exist.
24777 git-gui: Added current TODO list.
24778 git-gui: Last minute idea about fetch shortcuts.
24779 git-gui: Automatically reopen any console closed by the user.
24780 git-gui: Cache all repo-config data in an array.
24781 git-gui: Added support for pulling from default branch of a remote.
24782 git-gui: Updated TODO list now that pull is starting to work.
24783 git-gui: Corrected diff-index/diff-files protocol parsing errors.
24784 git-gui: Performance improvements for large file sets.
24785 git-gui: More performance improvements to rescan logic.
24786 git-gui: Flip commit message buffer and diff area.
24787 git-gui: Added repack database menu option, to invoke git repack.
24788 git-gui: Allow the user to disable update-index --refresh during rescan.
24789 git-gui: Grab the index lock while running pull.
24790 git-gui: Pluralize timestamps within the options menu.
24791 git-gui: Disable pull menu items when the index is locked.
24792 git-gui: Don't let the user pull into an uncommitted working directory.
24793 git-gui: Update TODO list.
24794 git-gui: Bug fix for bad variable reference in display_file.
24795 git-gui: Changed term 'check-in' to 'include'.
24796 git-gui: Show only the abbreviated SHA1 after committing.
24797 git-gui: Cache the GIT_COMMITTER_IDENT value on first sign-off.
24798 git-gui: Save window geometry to .git/config during exit.
24799 git-gui: Change accelerator for "Include All" to M1-I.
24800 git-gui: Created edit menu and basic editing bindings.
24801 git-gui: Clear undo/redo stack when loading a message file from disk.
24802 git-gui: Updated TODO list now that geometry is stored.
24803 git-gui: Always indicate the file in the diff viewer.
24804 git-gui: Correctly handle files containing LF in their name.
24805 git-gui: Efficiently update the UI after committing.
24806 git-gui: Use catch rather than array names to check file.
24807 git-gui: Rename difffont/mainfont variables.
24808 git-gui: Use native tk_messageBox for errors.
24809 git-gui: Cleaned up error message formatting.
24810 git-gui: Simplified format of geometry configuration.
24811 git-gui: Misc. formatting cleanups.
24812 git-gui: Misc. bug fixes for mouse click crashes.
24813 git-gui: Added context menus for consoles and commit message buffer.
24814 git-gui: Fix mouse cursor behavior when in widgets.
24815 git-gui: Teach sign off to be more intelligent.
24816 git-gui: Corrected font used for options menu items.
24817 git-gui: Honor system font and let user configure fonts.
24818 git-gui: Allow the user to change the diff viewer font size.
24819 git-gui: Refresh a file if it has an empty diff.
24820 git-gui: Make use of the Tk font system rather than faking it.
24821 git-gui: Improve right click context menu binding on all platforms.
24822 git-gui: Rename quitting global to is_quitting.
24823 git-gui: Use arrow cursor rather than left_ptr.
24824 git-gui: Refactor options menu into an options dialog.
24825 git-gui: Allow the user to manipulate the fonts from the options panel.
24826 git-gui: Supply progress feedback when running update-index.
24827 git-gui: Minor options dialog UI cleanups.
24828 git-gui: Added Options... menu item to end of diff context menu.
24829 git-gui: Use 'after 1' to post UI rather than tkwait.
24830 git-gui: Correct bugs in font config handling.
24831 git-gui: Hide non-commit related commands when invoked as git-citool.
24832 git-gui: Don't load the global options unless necessary.
24833 git-gui: Allow the user to disable diff stat summary during pull.
24834 git-gui: Run the pre-commit hook in the background.
24835 git-gui: Remove the commit_active global variable.
24836 git-gui: Added post-commit invocation after the commit is done.
24837 git-gui: Always use eq/ne for string comparsions.
24838 git-gui: Reshow diff if we sent the file to update-index.
24839 git-gui: Cleanup diff construction code to prepare for more options.
24840 git-gui: Allow the user to control the number of context lines in a diff.
24841 git-gui: Sort the list of paths being updated in the index.
24842 git-gui: Use a smaller pipe buffer for update-index.
24843 git-gui: Allow the user to copy name of the file in the diff viewer.
24844 git-gui: Correct language for M_/A_ status codes.
24845 git-gui: Display status on left in diff header.
24846 git-gui: Minor UI layout improvements for console windows.
24847 git-gui: Reverted file name text field to a label.
24848 git-gui: By default don't allow partially included files.
24849 git-gui: Refactor mouse clicking on file names/icons.
24850 git-gui: Narrow the no differences information message.
24851 git-gui: Implemented multiple selection in file lists.
24852 git-gui: Refactor update_status -> rescan.
24853 git-gui: Provide an after-rescan script to rescan.
24854 git-gui: Allow update_index to also run a script when it completes.
24855 git-gui: Automatically update-index all included files before commit.
24856 git-gui: Disable diff actions when no diff is active.
24857 git-gui: Created makefile to install the program.
24858 git-gui: Correctly handle GIT_DIR environment variable.
24859 git-gui: Create Windows shortcut icons for git-gui.
24860 git-gui: Protect ourselves from funny GIT_DIR/working directory setups.
24861 git-gui: Handle ' within paths when creating Windows shortcuts.
24862 git-gui: Only populate a fetch or push if we have an action.
24863 git-gui: Create a .app file on MacOS X if requested.
24864 git-gui: Display error dialog on Mac OS X when no .git found.
24865 git-gui: Make initial commits work properly.
24866 git-gui: Only reshow diff when really necessary.
24867 git-gui: Refactor file state representations.
24868 git-gui: Add menu option to include only selected files.
24869 git-gui: Misc. comment formatting cleanups.
24870 git-gui: Start UI with the index locked.
24871 git-gui: Remove completed items from TODO list.
24872 git-gui: Toggle between new commit and amend commit modes.
24873 git-gui: Verify the user has GIT_COMMITTER_IDENT before comitting.
24874 git-gui: Rephrase rescan before commit informational message.
24875 git-gui: Allow adding untracked files in selection.
24876 git-gui: Don't create PkgInfo on Mac OS X "desktop icons".
24877 git-gui: Teach the gui how to uninclude a file.
24878 git-gui: Make consecutive icon clicks toggle included status of a file.
24879 git-gui: Correct toggling of deleted file status.
24880 git-gui: Fix list loading corruption introduced by 1461c5f3.
24881 git-gui: Describe deleted symlinks in a more friendly way.
24882 git-gui: Correct toggling of added/untracked status for new files.
24883 git-gui: Updated TODO list now that a task is complete.
24884 git-gui: Refactored diff line display formatting logic.
24885 git-gui: Restore the all important shebang line.
24886 git-gui: Update in memory states after commit.
24887 git-gui: Correct some state matchings for include/remove.
24888 git-gui: Improve handling of merge commits.
24889 git-gui: Allow users to run fsck-objects from the gui.
24890 git-gui: Don't save amended commit message buffer.
24891 git-gui: Reworded verify console title.
24892 git-gui: Seperate out the database operations in project menu.
24893 git-gui: Rename Project menu to Repository.
24894 git-gui: Added about dialog box.
24895 git-gui: Be more Macintosh like.
24896 git-gui: Make the copyright notice serve double duty.
24897 git-gui: Include the Tcl/Tk version in the about dialog.
24898 git-gui: Abstract out windows platform test to is_Windows proc.
24899 git-gui: Correct is_MacOSX platform test.
24900 git-gui: Warn Cygwin users about possible environment issues.
24901 git-gui: Added configuration editor TODO list.
24902 git-gui: Refactor M1 binding selection.
24903 git-gui: Added menu command to visualize all branches.
24904 git-gui: Don't start 'gitk --all' on Mac OS X.
24905 git-gui: Improve pull error dialogs.
24906 git-gui: Added revert changes command.
24907 git-gui: Display the current branch.
24908 git-gui: Support file state MD (modified/deleted).
24909 git-gui: Created Branch menu.
24910 git-gui: Parse off refs/remotes when showing current branch.
24911 git-gui: Abort on not implemented branch switching.
24912 git-gui: Automatically skip tracking branches in branch menu.
24913 git-gui: Rename all_branches -> all_heads.
24914 git-gui: Misc. comment and formatting cleanups.
24915 git-gui: Started implementation of switch_branch.
24916 git-gui: Set a proper title on our revert confirm dialog box.
24917 git-gui: Updated todo list.
24918 git-gui: Enable resolution of merge conflicts.
24919 git-gui: Auto-update any A? or M? files during rescan.
24920 git-gui: Reworded 'Include' to 'Add' to match core Git.
24921 git-gui: Created very crude Tools menu, to support miga.
24922 git-gui: Show all fetched branches for remote pulls.
24923 git-gui: Run git-gc rather than git-repack.
24924 git-gui: Corrected behavior of deleted (but existing in HEAD) files.
24925 git-gui: Correct wording of the revert confirmation dialog.
24926 git-gui: Work around odd cygpath bug on Windows.
24927 git-gui: Change more 'include' language to 'add'.
24928 git-gui: Hide the ugly bash command line from the windows desktop icon.
24929 git-gui: Modified makefile to embed version into git-gui script.
24930 git-gui: Display the git-gui version in the Help->About dialog.
24931 git-gui: Display the full GPL copyright notice in about dialog.
24932 git-gui: Ensure version number is always current.
24933 git-gui: Allow the user to copy the version data to the clipboard.
24934 git-gui: Don't offer my miga hack if its configuration file isn't present.
24935 git-gui: Suggest when running 'git gc' may be worthwhile.
24936 git-gui: Refactor reponame computation.
24937 git-gui: Cleanup usage of gitdir global variable.
24938 git-gui: Allow [gitdir ...] to act as [file join [gitdir] ...].
24939 git-gui: Make the gitk starting message match our usual format.
24940 git-gui: Display the directory we are entering during startup.
24941 git-gui: Start file status display refactoring.
24942 git-gui: Convert UI to use 'staged for commit' interface.
24943 git-gui: Correct DD file state to be only D_.
24944 git-gui: Remove invalid DM state.
24945 git-gui: Cleanup state descriptions.
24946 git-gui: Refactor add/remove proc names to align with reality.
24947 git-gui: Add or unstage based on the specific icon used.
24948 git-gui: Refactor the revert (aka checkout-index) implementation.
24949 git-gui: Refactor the add to commit state filters.
24950 git-gui: Simplify printing of index info to update-index.
24951 git-gui: Only permit selection in one list at a time.
24952 git-gui: Pad the cancel/save buttons in the options window.
24953 git-gui: Implemented create branch GUI.
24954 git-gui: Bind M1-N to create branch.
24955 git-gui: Implemented local branch deletion.
24956 git-gui: Allow users to delete branches merged upstream.
24957 git-gui: Allow creating branches from tracking heads.
24958 git-gui: Use borders on text fields in branch dialog.
24959 git-gui: Remove 'Allow Partially Added Files' option.
24960 git-gui: Move commit_prehook into commit_tree.
24961 git-gui: Improve the branch delete confirmation dialogs.
24962 git-gui: Don't delete the test target branch.
24963 git-gui: Attempt to checkout the new branch after creation.
24964 git-gui: Refactor current_diff -> current_diff_path.
24965 git-gui: Remove combined diff showing behavior.
24966 git-gui: Improve the display of merge conflicts.
24967 git-gui: Improve diff --cc viewing for unmerged files.
24968 git-gui: Fix bug in unmerged file display.
24969 git-gui: Clear diff from viewer if the side changed.
24970 git-gui: Correct disappearing unstaged files.
24971 git-gui: Add Refresh to diff viewer context menu.
24972 git-gui: Correct unmerged file detection at commit time.
24973 git-gui: Pad new branch name input box.
24974 git-gui: Use a grid layout for branch dialog.
24975 git-gui: Improve the merge check interface for branch deletion.
24976 git-gui: Change rude error popup to info popup.
24977 git-gui: Correctly ignore '* Unmerged path' during diff.
24978 git-gui: Make diff viewer colors match gitk's defaults.
24979 git-gui: Never line wrap in file lists.
24980 git-gui: Don't offer tracking branches if none exist.
24981 git-gui: Give a better error message on an empty branch name.
24982 git-gui: Allow user to specify a branch name pattern.
24983 git-gui: Improve keyboard traversal in dialogs.
24984 git-gui: Fully select a field when entering into it.
24985 git-gui: Automatically toggle the relevant radio buttons.
24986 git-gui: Correctly categorize tracking branches and heads.
24987 git-gui: Update todo list with finished and new items.
24988 git-gui: Slightly tweak new window geometry.
24989 git-gui: Create missing branch head on initial commit.
24990 git-gui: Don't format the mode line of a diff.
24991 git-gui: Force an update-index --refresh on unchanged files.
24992 git-gui: Don't attempt to tag new file/deleted file headers in diffs.
24993 git-gui: Fix 'Select All' action on Windows.
24994 git-gui: Ignore 'No newline at end of file' marker line.
24995 git-gui: Always start a rescan on an empty diff.
24996 git-gui: Don't show content of untracked binary files.
24997 git-gui: Limit display of large untracked files.
24998 git-gui: When possible show the type of an untracked file.
24999 git-gui: Don't try to tag the 'Binary files * and * differ' line.
25000 git-gui: Remove spurious newline in untracked file display.
25001 git-gui: Honor system encoding for filenames.
25002 git-gui: Handle commit encoding better.
25003 git-gui: Display database stats (count-objects -v) on demand.
25004 git-gui: Implement basic branch switching through read-tree.
25005 git-gui: Use system default labelframe bordering.
25006 git-gui: Display the size of the pack directory.
25007 git-gui: Only allow Refresh in diff context menu when we have a diff.
25008 git-gui: Allow staging/unstaging individual diff hunks.
25009 git-gui: Elide CRs appearing in diff output from display.
25010 git-gui: Cleanup end-of-line whitespace in commit messages.
25011 git-gui: Unset unnecessary UI setup variable.
25012 git-gui: Force focus to the diff viewer on mouse click.
25013 git-gui: Support 'Visualize All Branches' on Mac OS X.
25014 git-gui: Pad the database statistics dialog window.
25015 git-gui: Prefer Tk's entry widget over a 1 line text field.
25016 git-gui: Remove Pull menu and cleanup Branch/Fetch/Push menus.
25017 git-gui: Don't switch branches if changing to the current branch.
25018 git-gui: Maintain the same file list for diff during refresh.
25019 git-gui: Always use lsearch -exact, to prevent globbing.
25020 git-gui: Added arbitrary branch pushing support.
25021 git-gui: Remove no longer used pull from remote code.
25022 git-gui: Always use -v option to push.
25023 git-gui: Refactor console success/failure handling.
25024 git-gui: Use builtin version of 'git gc'.
25025 git-gui: Implement local merge operations.
25026 git-gui: Let users abort with `reset --hard` type logic.
25027 git-gui: Update status bar during a merge.
25028 git-gui: Don't allow users to commit a bad octopus merge.
25029 git-gui: Don't allow merges in the middle of other things.
25030 git-gui: Always offer scrollbars for branch lists.
25031 git-gui: Support merge.summary, merge.verbosity.
25032 git-gui: Reword meaning of merge.summary.
25033 git-gui: Offer quick access to the HTML formatted documentation.
25034 git-gui: Test for Cygwin differently than from Windows.
25035 git-gui: Implemented file browser and incremental blame.
25036 git-gui: Improve the icons used in the browser display.
25037 git-gui: Display the current branch name in browsers.
25038 git-gui: Allow users to edit user.name, user.email from options.
25039 git-gui: Use -M and -C when running blame.
25040 git-gui: Correctly handle spaces in filepaths.
25041 git-gui: Display original filename and line number in blame.
25042 git-gui: Install column headers in blame viewer.
25043 git-gui: Use a grid layout for the blame viewer.
25044 git-gui: Assign background colors to each blame hunk.
25045 Correct ^0 asciidoc syntax in fast-import docs.
25046 Correct some language in fast-import documentation.
25047 Correct spelling of fast-import in docs.
25048 tar archive frontend for fast-import.
25049 git-gui: Update known branches during rescan.
25050 git-gui: Support keyboard traversal in browser.
25051 git-gui: Replace \ with \\ when showing paths.
25052 git-gui: Refactor single_commit to a proc.
25053 git-gui: Separate transport/branch menus from multicommit.
25054 git-gui: Optionally save commit buffer on exit.
25055 git-gui: View blame from the command line.
25056 git-gui: Select subcommands like git does.
25057 git-gui: Relabel the Add All action.
25058 git-gui: Use git-config now over git-repo-config.
25059 git-gui: Redesign the display of annotated files.
25060 git-gui: Jump to the first annotation block as soon as its available.
25061 git-gui: Improve annotated file display.
25062 git-gui: Focus into blame panels on Mac OS.
25063 git-gui: Stop deleting gitk preferences.
25064 fast-import: Hide the pack boundary commits by default.
25065 fast-import: Add tip about importing renames.
25066 bash: Hide git-fast-import.
25067 fast-import: Support reusing 'from' and brown paper bag fix reset.
25068 git-gui: Allow gitexecdir, INSTALL to be set by the caller.
25069 git-gui: Rename GIT_VERSION to GITGUI_VERSION.
25070 git-gui: Generate a version file on demand.
25071 git-gui: Handle gitgui tags in version gen.
25072 git-gui: Guess our version accurately as a subproject.
25073 git-gui: Change base version to 0.6.
25074 Link git-gui into the master Makefile.
25077 Print a sane error message if an alias expands to an invalid git command
25078 Allow aliases to expand to shell commands
25081 Version v1.5.0-rc4; changes since v1.5.0-rc3:
25082 ---------------------------------------------
25085 Avoid ActiveState Perl IO in t800[12]
25088 doc: hooks.txt said post-commit default sends an email, it doesn't
25089 git-for-each-ref doesn't return "the bit after $GIT_DIR/refs"
25091 Aneesh Kumar K.V (1):
25092 blameview: Support browsable functionality to blameview.
25095 git-blame: an Emacs minor mode to view file with git-blame output.
25098 git-svn: do not let Git.pm warn if we prematurely close pipes
25099 Disallow invalid --pretty= abbreviations
25102 git-archimport: initial import needs empty directory
25104 Horst H. von Brand (1):
25105 Call make always with CFLAGS in git.spec
25107 Johannes Schindelin (4):
25108 Teach the '@{...}' notation to git-log -g
25109 Update the documentation for the new '@{...}' syntax
25110 Commands requiring a work tree must not run in GIT_DIR
25111 fast-import: Fix compile warnings
25113 Junio C Hamano (36):
25114 create_symref(): do not assume pathname from git_path() persists long enough
25115 detached HEAD -- finishing touches
25116 Use "git checkout -q" in git-bisect
25117 Tutorial: fix asciidoc formatting of "git add" section.
25118 Tutorial-2: Adjust git-status output to recent reality.
25119 core-tutorial: http reference link fix
25120 fix reflog entries for "git-branch"
25121 honor GIT_REFLOG_ACTION in git-commit
25122 Why is it bad to rewind a branch that has already been pushed out?
25123 combine-diff: special case --unified=0
25124 show-branch -g: default to the current branch.
25125 git-clone --reference: saner handling of borrowed symrefs.
25126 Revert "Allow branch.*.merge to talk about remote tracking branches."
25127 Rename get_ident() to fmt_ident() and make it available to outside
25128 t9200: Work around HFS+ issues.
25129 bisect: it needs to be done in a working tree.
25130 git-blame: no rev means start from the working tree file.
25131 Add pretend_sha1_file() interface.
25132 Use pretend_sha1_file() in git-blame and git-merge-recursive.
25133 blame: document --contents option
25134 Teach git-remote add to fetch and track
25135 Fix longstanding mismerge of ALL_CFLAGS vs BASIC_CFLAGS
25136 gitk: Use show-ref instead of ls-remote
25137 git-push: allow globbing wildcard refspec.
25138 gitweb: fix mismatched parenthesis
25139 annotate: fix for cvsserver.
25141 Remove contrib/colordiff
25142 Add deprecation notices.
25143 Remove git-merge-recur
25144 git-clone --reference: work well with pack-ref'ed reference repository
25145 for-each-reflog: fix case for empty log directory
25146 t4200: skip gc-rerere test on systems with non GNU date.
25147 git-add -i: update removed path correctly.
25148 Documentation: Add gfi to the main command list.
25151 Linus Torvalds (2):
25152 pager: Work around window resizing bug in 'less'
25153 Fix "git log -z" behaviour
25156 gitk - remove trailing whitespace from a few lines.
25157 Make gitk work reasonably well on Cygwin.
25159 Michael Coleman (1):
25160 Fix some documentation typos and grammar
25162 Michele Ballabio (1):
25163 Documentation: add KMail in SubmittingPatches
25165 Nicolas Pitre (14):
25166 make reflog filename independent from struct ref_lock
25167 lock_ref_sha1_basic(): remember the original name of a ref when resolving it
25168 enable separate reflog for HEAD
25169 add reflog entries for HEAD when detached
25170 move create_symref() past log_ref_write()
25171 add logref support to git-symbolic-ref
25172 add reflog when moving HEAD to a new branch
25173 reword the detached head message a little again
25174 add a quiet option to git-checkout
25175 prevent HEAD reflog to be interpreted as current branch reflog
25176 provide a nice @{...} syntax to always mean the current branch reflog
25177 scan reflogs independently from refs
25178 Enable HEAD@{...} and make it independent from the current branch
25179 Let git-checkout always drop any detached head
25182 git-config --rename-section could rename wrong section
25183 Assorted typo fixes
25185 Robin Rosenberg (1):
25186 Why is it bad to rewind a branch that has already been pushed out?
25188 Shawn O. Pearce (113):
25189 Created fast-import, a tool to quickly generating a pack from blobs.
25190 Added automatic index generation to fast-import.
25191 Cleaned up memory allocation for object_entry structs.
25192 Refactored fast-import's internals for future additions.
25193 Added basic command handler to fast-import.
25194 Implemented branch handling and basic tree support in fast-import.
25195 Added tree and commit writing to fast-import.
25196 Implement blob ID validation in fast-import.
25197 Converted fast-import to a text based protocol.
25198 Changed fast-import's pack header creation to use pack.h
25199 Allow symlink blobs in trees during fast-import.
25200 Fixed segfault in fast-import after growing a tree.
25201 Converted fast-import to accept standard command line parameters.
25202 Added mark store/find to fast-import.
25203 Added branch load counter to fast-import.
25204 Implemented 'tag' command in fast-import.
25205 Implemented tree reloading in fast-import.
25206 Round out memory pool allocations in fast-import to pointer sizes.
25207 Remove branch creation command from fast-import.
25208 Moved from command to after data to help cvs2svn.
25209 Account for tree entry memory costs in fast-import.
25210 Added option to export the marks table when fast-import terminates.
25211 Added --branch-log to option to fast-import.
25212 Fixed GPF in fast-import caused by unterminated linked list.
25213 Fixed compile error in fast-import.
25214 Map only part of the generated pack file at any point in time.
25215 Added 'reset' command to clear a branch's tree.
25216 Don't crash fast-import if no branch log was requested.
25217 Converted hash memcpy/memcmp to new hashcpy/hashcmp/hashclr.
25218 Implemented tree delta compression in fast-import.
25219 Recycle data buffers for tree generation in fast-import.
25220 Reuse the same buffer for all commits/tags in fast-import.
25221 Replace ywrite in fast-import with the standard write_or_die.
25222 Correct tree corruption problems in fast-import.
25223 Additional fast-import tree delta corruption cleanups.
25224 Fix repository corruption when using marks for modified blobs.
25225 Support creation of merge commits in fast-import.
25226 Allow creating branches without committing in fast-import.
25227 Improve reuse of sha1_file library within fast-import.
25228 Misc. type cleanups within fast-import.
25229 Restructure fast-import to support creating multiple packfiles.
25230 Remove unnecessary duplicate_count in fast-import.
25231 Implemented manual packfile switching in fast-import.
25232 Don't create a final empty packfile in fast-import.
25233 Optimize index creation on large object sets in fast-import.
25234 Implemented automatic checkpoints within fast-import.
25235 Print the packfile names to stdout from fast-import.
25236 Corrected buffer overflow during automatic checkpoint in fast-import.
25237 Use uintmax_t for marks in fast-import.
25238 Replace redundant yread() with read_in_full() in fast-import.
25239 Reuse sha1 in packed_git in fast-import.
25240 Use .keep files in fast-import during processing.
25241 Ensure we close the packfile after creating it in fast-import.
25242 Remove unnecessary pack_fd global in fast-import.
25243 Correct max_packsize default in fast-import.
25244 Correct object_count type and stat output in fast-import.
25245 Print out the edge commits for each packfile in fast-import.
25246 Corrected BNF input documentation for fast-import.
25247 Correct a few types to be unsigned in fast-import.
25248 Declare no-arg functions as (void) in fast-import.
25249 Correct packfile edge output in fast-import.
25250 Always use struct pack_header for pack header in fast-import.
25251 Use fixed-size integers when writing out the index in fast-import.
25252 Remove unnecessary options from fast-import.
25253 Support delimited data regions in fast-import.
25254 Create test case for fast-import.
25255 Reduce value duplication in t9300-fast-import.
25256 Accept 'inline' file data in fast-import commit structure.
25257 Pull out remote listing functions in git-remote.
25258 Teach 'git remote' how to cleanup stale tracking branches.
25259 Cleanup prepare_packed_git_one to reuse install_packed_git.
25260 Correct comment in prepare_packed_git_one.
25261 Refactor open_packed_git to return an error code.
25262 Don't find objects in packs which aren't available anymore.
25263 Don't leak file descriptors from unavailable pack files.
25264 Cleanup subcommand documentation for git-remote.
25265 Keep untracked files not involved in a merge.
25266 Default GIT_MERGE_VERBOSITY to 5 during tests.
25267 bash: Remove short option completions for branch/checkout/diff.
25268 bash: Classify cat-file and reflog as plumbing.
25269 bash: Complete long options to git-add.
25270 bash: Add space after unique command name is completed.
25271 bash: Classify more commends out of completion.
25272 bash: Support unique completion on git-config.
25273 bash: Support unique completion when possible.
25274 bash: Support internal revlist options better.
25275 Include checkpoint command in the BNF.
25276 Reduce memory usage of fast-import.
25277 Show an example of deleting commits with git-rebase.
25278 bash: Support completion on git-cherry.
25279 bash: Hide diff-stages from completion.
25280 bash: Offer --prune completion for git-gc.
25281 bash: Hide git-resolve, its deprecated.
25282 bash: Support --add completion to git-config.
25283 bash: Support git-bisect and its subcommands.
25284 Don't support shell-quoted refnames in fast-import.
25285 Initial draft of fast-import documentation.
25286 bash: Support git-rebase -m continuation completion.
25287 bash: Complete git-remote subcommands.
25288 Remove --branch-log from fast-import.
25289 Correct compiler warnings in fast-import.
25290 Correct minor style issue in fast-import.
25291 Correct fast-import timezone documentation.
25292 Remove unnecessary null pointer checks in fast-import.
25293 Minor fast-import documentation corrections.
25294 Support RFC 2822 date parsing in fast-import.
25295 Don't do non-fastforward updates in fast-import.
25296 Minor timestamp related documentation corrections for fast-import.
25297 Teach fast-import how to clear the internal branch content.
25298 Teach fast-import how to sit quietly in the corner.
25299 Dump all refs and marks during a checkpoint in fast-import.
25300 Don't crash fast-import if the marks cannot be exported.
25301 Add a Tips and Tricks section to fast-import's manual.
25303 Simon 'corecode' Schubert (1):
25304 Allow forcing of a parent commit, even if the parent is not a direct one.
25307 Add hg-to-git conversion utility.
25309 Uwe Kleine-König (1):
25310 add replay and log to the usage string of git-bisect
25313 gitweb: Convert project name to UTF-8
25316 Version v1.5.0-rc3; changes since v1.5.0-rc2:
25317 ---------------------------------------------
25320 Insert ACTIVESTATE_STRING in Git.pm
25321 Force Activestate Perl to tie git command pipe handle to a handle class
25322 Cleanup uninitialized value in chomp
25323 Allow default core.logallrefupdates to be overridden with template's config
25324 Fix git-update-index to work with relative pathnames.
25326 Alexandre Julliard (1):
25327 vc-git.el: Take into account the destination name in vc-checkout.
25330 New files in git weren't being downloaded during CVS update
25331 If abbrev is set to zero in git-describe, don't add the unique suffix
25332 Allow the tag signing key to be specified in the config file
25333 UNIX reference time of 1970-01-01 00:00 is UTC timezone, not local time zone
25334 Heavily expanded update hook to send more useful emails than the old hook
25336 Aneesh Kumar K.V (2):
25337 blameview: Use git-cat-file to read the file content.
25338 Update git-cat-file documentation
25341 Document --check option to git diff.
25344 Improved error message from git-rebase
25347 git-svn: remove leading slash when printing removed directories
25349 J. Bruce Fields (31):
25350 Documentation: add git user's manual
25351 Documentation: expand preface and todo's
25352 Documentation: git-rebase discussion, miscellaneous user-manual updates
25353 Documentation: more user-manual todo's
25354 Documentation: reorder development section, todo's
25355 Documentation: begin discussion of git-remote in user manual
25356 Documentation: rev-list -> rev-parse, other typos, start examples
25357 user manual: answer some comments from Junio
25358 user-manual: replace init-db by init
25359 user-manual: reindent
25360 user-manual: rewrap, fix heading levels
25361 user-manual: add "quick start" as chapter 1
25362 user-manual: minor quickstart reorganization
25363 user-manual: clarify difference between tag and branch
25364 user-manual: update references discussion
25365 user-manual: update git-gc discussion
25366 user-manual: stub discussion of fsck and reflog
25367 user-manual: reorganize fetch discussion, add internals, etc.
25368 user-manual: git-fsck, dangling objects
25369 user-manual: fsck-objects -> fsck
25370 user-manual: repo-config -> config
25371 user-manual: add references to git-config man page
25372 user-manual: typo fix
25373 user-manual: fix a header level
25374 user-manual: reflogs, other recovery
25375 user-manual: rewrap a few long lines
25376 user-manual: minor "TODO" updates
25377 user-manual: document git-show-branch example
25378 user-manual: SHA1 -> object name
25379 user-manual: point to README for gitweb information
25380 user-manual: todo's
25382 Jakub Narebski (3):
25383 Documentation/config.txt: Document config file syntax better
25384 t/t1300-repo-config.sh: value continued on next line
25385 Documentation/config.txt: Correct info about subsection name
25388 Use inttypes.h rather than stdint.h.
25391 format-patch: fix bug with --stdout in a subdirectory
25392 contrib/vim: update syntax for changed commit template
25393 diffcore-pickaxe: fix infinite loop on zero-length needle
25394 Add a sample program 'blameview' to show how to use git-blame --incremental
25396 Johannes Schindelin (2):
25397 annotate: use pager
25398 reflog inspection: introduce shortcut "-g"
25401 Add a missing fork() error check.
25403 Junio C Hamano (43):
25404 User manual: fix typos in examples
25405 Documentation/tutorial-2: Fix interesting typo in an example.
25406 Revert "prune: --grace=time"
25407 Make sure git_connect() always give two file descriptors.
25408 is_repository_shallow(): prototype fix.
25409 shallow repository: disable unsupported operations for now.
25410 git-gc: do not run git-prune by default.
25411 cvsimport: activate -a option, really.
25412 .mailmap: fix screw-ups in Uwe's name
25413 honor --author even with --amend, -C, and -c.
25414 reflog gc: a tag that does not point at a commit is not a crime.
25415 git-checkout -m: fix merge case
25416 git-daemon documentation on enabling services.
25417 ls-remote and clone: accept --upload-pack=<path> as well.
25418 Refactor the pack header reading function out of receive-pack.c
25419 Allow fetch-pack to decide keeping the fetched pack without exploding
25420 fetch-pack: remove --keep-auto and make it the default.
25421 Consolidate {receive,fetch}.unpackLimit
25422 Allow non-developer to clone, checkout and fetch more easily.
25423 parse-remote: do not barf on a remote shorthand without any refs to fetch.
25424 show-branch -g: default to HEAD
25425 Documentation: pack-refs --all vs default behaviour
25426 Make sure we do not write bogus reflog entries.
25427 git-merge: leave sensible reflog message when used as the first level UI.
25428 create_symref: check error return from open().
25429 write_in_full: size_t is unsigned.
25430 Don't force everybody to call setup_ident().
25431 git-blame --porcelain: quote filename in c-style when needed.
25432 Update describe documentation.
25433 Document 'git-blame --incremental'
25434 git-fsck-objects is now synonym to git-fsck
25435 Two small typofixes.
25436 lock_any_ref_for_update(): do not accept malformatted refs.
25437 git-commit -s: no extra space when sign-offs appear at the end already.
25438 git-blame: somewhat better commenting.
25439 git-send-email: remove debugging output.
25441 Documentation: "git-checkout <tree> <path>" takes any tree-ish
25442 t9200: Re-code non-ascii path test in UTF-8
25443 t9200: do not test -x bit if the filesystem does not support it.
25444 git main documentation: point at the user's manual.
25445 Do not use hardcoded path to xhmtl.xsl to generate user's manual
25448 Linus Torvalds (5):
25449 fsck-objects: refactor checking for connectivity
25450 Fix seriously broken "git pack-refs"
25451 Add dangling objects tips.
25452 git-blame --incremental
25453 git-push through git protocol
25456 wt-status: Actually accept `color.status.BLAH' configuration variables.
25457 Documentation/config.txt: Fix documentation of colour config tweaks.
25458 Make fsck and fsck-objects be builtins.
25461 fix suggested branch creation command when detaching head
25462 git-log -g --pretty=oneline should display the reflog message
25463 tone down the detached head warning
25466 sha1_file.c: Avoid multiple calls to find_pack_entry().
25467 Documentation: --amend cannot be combined with -c/-C/-F.
25470 git-blame --incremental: don't use pager
25473 contrib/emacs/vc-git.el: support vc-version-other-window
25476 git-fetch: Allow fetching the remote HEAD
25478 Shawn O. Pearce (6):
25479 Remove unnecessary found variable from describe.
25480 Teach git-describe to display distances from tags.
25481 Compute accurate distances in git-describe before output.
25482 Teach for-each-ref about a little language called Tcl.
25483 Don't coredump on bad refs in update-server-info.
25484 Escape --upload-pack from expr.
25486 Simon 'corecode' Schubert (1):
25487 Replace perl code with pure shell code
25490 Rename git-repo-config to git-config.
25492 Uwe Kleine-König (2):
25493 rename --exec to --upload-pack for fetch-pack and peek-remote
25494 make --upload-pack option to git-fetch configurable
25497 Version v1.5.0-rc2; changes since v1.5.0-rc1:
25498 ---------------------------------------------
25501 git-revert: Fix die before git-sh-setup defines it.
25503 Chris Wedgwood (1):
25504 cache.h; fix a couple of prototypes
25507 Shell syntax fix in git-reset
25508 Document --ignore-if-in-upstream in git-format-patch
25511 gitk: add current directory to main window title
25514 git-svn: fix tests to work with older svn
25515 git-svn: print and flush authentication prompts to STDERR
25518 Start all test scripts with /bin/sh.
25519 Set _ALL_SOURCE for AIX, but avoid its struct list.
25520 Replace "echo -n" with printf in shell scripts.
25521 Solaris 5.8 returns ENOTDIR for inappropriate renames.
25524 git-pull: disallow implicit merging to detached HEAD
25526 Johannes Schindelin (9):
25527 Fix spurious compile error
25528 config_set_multivar(): disallow newlines in keys
25529 show_date(): fix relative dates
25530 apply --cached: fix crash in subdirectory
25531 Do not verify filenames in a bare repository
25532 Teach the revision walker to walk by reflogs with --walk-reflogs
25533 --walk-reflogs: disallow uninteresting commits
25534 --walk-reflogs: actually find the right commit by date.
25535 --walk-reflogs: do not crash with cyclic reflog ancestry
25537 Junio C Hamano (69):
25538 reflog-expire: brown paper bag fix.
25539 merge-recursive: do not report the resulting tree object name
25540 Explain "Not a git repository: '.git'".
25542 Make git-prune-packed a bit more chatty.
25543 Define cd_to_toplevel shell function in git-sh-setup
25544 Use cd_to_toplevel in scripts that implement it by hand.
25545 Allow whole-tree operations to be started from a subdirectory
25546 Use log output encoding in --pretty=email headers.
25547 t3901: test "format-patch | am" pipe with i18n
25548 git-commit documentation: -a adds and also removes
25549 Consistent message encoding while reusing log from an existing commit.
25550 More tests in t3901.
25551 git log documentation: teach -<n> form.
25553 Documentation: merge-output is not too verbose now.
25554 Use merge-recursive in git-revert/git-cherry-pick
25555 git reflog expire: document --stale-fix option.
25556 Fix git-fetch while on detached HEAD not to give needlessly alarming errors
25557 git-push documentation: remaining bits
25558 git-rm documentation: remove broken behaviour from the example.
25559 tutorial: shorthand for remotes but show distributed nature of git
25560 git-commit documentation: remove comment on unfixed git-rm
25561 Use merge-recursive in git-checkout -m (branch switching)
25562 Document where configuration files are in config.txt
25563 git-commit: document log message formatting convention
25564 Documentation/SubmittingPatches: Gnus tips
25565 Documentation/git-tag: the command can be used to also verify a tag.
25566 Documentation/git-tools.txt: mention tig and refer to wiki
25567 Documentation/git-tar-tree.txt: default umask is now 002
25568 Documentation/git-status.txt: mention color configuration
25569 Documentation/git-whatchanged.txt: show -<n> instead of --max-count.
25570 Documentation/git-sh-setup.txt: programmer's docs
25571 Documentation: detached HEAD
25572 Make a short-and-sweet "git-add -i" synonym for "git-add --interactive"
25573 Documentation: describe shallow repository
25574 Documentation/glossary.txt: unpacked objects are loose.
25575 Documentation/glossary.txt: describe remotes/ tracking and packed-refs
25576 Introduce 'git-format-patch --suffix=.patch'
25577 git-format-patch: do not crash with format.headers without value.
25578 Documentation/git-resolve: deprecated.
25579 Documentation: suggest corresponding Porcelain-level in plumbing docs.
25580 Documentation: m can be relative in "git-blame -Ln,m"
25581 Documentation/git-parse-remote.txt: we deal with config vars as well
25582 git-format-patch -3
25583 Add --summary to git-format-patch by default
25584 git-format-patch: make --binary on by default
25585 git-format-patch: the default suffix is now .patch, not .txt
25586 Use fixed-size integers for .idx file I/O
25587 Documentation: move command list in git.txt into separate files.
25588 Documentation: sync git.txt command list and manual page title
25589 Documentation: Generate command lists.
25590 for_each_reflog_ent: do not leak FILE *
25591 refs.c::read_ref_at(): fix bogus munmap() call.
25592 Documentation: generated cmds-*.txt does not depend on git.txt
25593 Documentation/git.txt: command re-classification
25594 dwim_ref(): Separate name-to-ref DWIM code out.
25595 Extend read_ref_at() to be usable from places other than sha1_name.
25596 show-branch --reflog: show the reflog message at the top.
25597 show-branch --reflog: tighten input validation.
25598 show-branch --reflog: fix show_date() call
25599 Stop ignoring Documentation/README
25600 git-tag -d: allow deleting multiple tags at once.
25601 branch -f: no reason to forbid updating the current branch in a bare repo.
25602 git-rebase: allow rebasing a detached HEAD.
25603 log --walk-reflog: documentation
25604 reflog-walk: build fixes
25605 Fix --walk-reflog with --pretty=oneline
25608 Linus Torvalds (2):
25609 Clean up write_in_full() users
25610 Fix up totally buggered read_or_die()
25612 Matthias Lederhofer (2):
25613 prune-packed: add -q to usage
25614 prune: --grace=time
25616 Michael S. Tsirkin (1):
25617 fix documentation for git-commit --no-verify
25620 use 'init' instead of 'init-db' for shipped docs and tools
25621 simplify the "no changes added to commit" message
25623 sanitize content of README file
25626 Make gitk work when launched in a subdirectory
25629 git-remote: no longer silent on unknown commands.
25632 Documentation: a few spelling fixes
25635 tutorial: Use only separate layout
25637 Shawn O. Pearce (18):
25638 Improve merge performance by avoiding in-index merges.
25639 Hide output about SVN::Core not being found during tests.
25640 Remove read_or_die in favor of better error messages.
25641 Remove unnecessary call_depth parameter in merge-recursive.
25642 Allow the user to control the verbosity of merge-recursive.
25643 Enable output buffering in merge-recursive.
25644 Display a progress meter during merge-recursive.
25645 Convert output messages in merge-recursive to past tense.
25646 Always perfer annotated tags in git-describe.
25647 Hash tags by commit SHA1 in git-describe.
25648 Use binary searching on large buckets in git-describe.
25649 Improve git-describe performance by reducing revision listing.
25650 Correct priority of lightweight tags in git-describe.
25651 Remove hash in git-describe in favor of util slot.
25652 Use nice names in conflict markers during cherry-pick/revert.
25653 Document the master@{n} reflog query syntax.
25654 Refer users to git-rev-parse for revision specification syntax.
25655 Document pack .idx file format upgrade strategy.
25657 Simon 'corecode' Schubert (2):
25658 Use fixed-size integers for the on-disk pack structure.
25659 Use standard -t option for touch.
25661 Uwe Kleine-König (4):
25662 document --exec for git-push
25663 Update documentation of fetch-pack, push and send-pack
25664 make --exec=... option to git-push configurable
25665 rename --exec to --receive-pack for push and send-pack
25668 Version v1.5.0-rc1; changes since v1.5.0-rc0:
25669 ---------------------------------------------
25672 Speed-up recursive by flushing index only once for all entries
25674 Alexandre Julliard (12):
25675 Shallow clone: do not ignore shallowness when following tags
25676 fetch-pack: Properly remove the shallow file when it becomes empty.
25677 upload-pack: Check for NOT_SHALLOW flag before sending a shallow to the client.
25678 git-fetch: Reset shallow_depth before auto-following tags.
25679 get_shallow_commits: Avoid memory leak if a commit has been reached already.
25680 fetch-pack: Do not fetch tags for shallow clones.
25681 git-clean: Fix the -q option.
25682 git.el: Don't use --info-only when resolving a file.
25683 git.el: Avoid setting font lock keywords before entering log-edit mode.
25684 git-apply: Remove directories that have become empty after deleting a file.
25685 git-clone: Make sure the master branch exists before running cat on it.
25686 git.el: Define the propertize function if needed, for XEmacs compatibility.
25689 hooks/commit-msg: add example to add Signed-off-by line to message
25691 Andy Whitcroft (6):
25692 send pack check for failure to send revisions list
25693 ssh-upload: prevent buffer overrun
25694 short i/o: clean up the naming for the write_{in,or}_xxx family
25695 short i/o: fix calls to read to use xread or read_in_full
25696 short i/o: fix calls to write to use xwrite or write_in_full
25697 short i/o: fix config updates to use write_in_full
25699 Brian Gernhardt (3):
25700 Add documentation for git-branch's color configuration.
25701 Ignore git-init and git-remote
25702 Auto-quote config values in config.c:store_write_pair()
25705 git-svn: quiet down tests and fix some unportable shell constructs
25706 git-svn: dcommit should diff against the current HEAD after committing
25707 t6024-recursive-merge: quiet down this test
25708 test-lib: quiet down init-db output for tests
25709 t9200-git-cvsexportcommit.sh: quiet down commit
25710 git-svn: remove non-delta fetch code paths
25711 git-svn: print out the SVN library version in --version, too
25712 git-svn: verify_ref() should actually --verify
25713 git-svn: sort multi-init output
25714 git-svn: remove svnadmin dependency from the tests
25715 git-svn: t/t9100-git-svn-basic: remove old check for NO_SYMLINK
25716 git-svn: t/t91??-*: optimize the tests a bit
25717 instaweb: load Apache mime and dir modules if they are needed
25718 git-svn: make multi-init less confusing
25719 git-svn: update documentation for multi-{init|fetch}
25720 git-svn: make --repack work consistently between fetch and multi-fetch
25721 Documentation/git-svn: clarify dcommit, rebase vs pull/merge
25722 git-svn: fix show-ignore
25723 git-svn: add --prefix= option to multi-init
25724 git-svn: pass an unambiguous ref to rev-list when grafting-branches
25725 Avoid errors and warnings when attempting to do I/O on zero bytes
25727 Fredrik Kuivinen (1):
25728 instaweb: Nicer error message when the http daemon isn't found
25730 J. Bruce Fields (9):
25731 Docs: update cvs-migration.txt to reflect clone's new default behavior
25732 Documentation: update git-clone.txt for clone's new default behavior
25733 Documentation: update glossary entry for "origin"
25734 Documentation: update tutorial's discussion of origin
25735 Documentation: update git-pull.txt for new clone behavior
25736 Documentation: remove master:origin example from pull-fetch-param.txt
25737 Documentation: tutorial editing
25738 Documentation: clarify definition of "reachable"
25739 Documentation: add git-remote man page
25741 Jakub Narebski (14):
25742 gitweb: Add mod_perl version string to "generator" meta header
25743 gitweb: Precompile CGI routines for mod_perl
25744 Add info about new test families (8 and 9) to t/README
25745 gitweb: Fix error in git_project_index subroutine
25746 gitweb: Fix bug in git_difftree_body (was '!=' instead of 'ne')
25747 gitweb: There can be empty patches (in git_patchset_body)
25748 gitweb: Fix "Use of uninitialized value" warning in git_tags_body
25749 gitweb: Fix error in git_patchest_body for file creation/deletion patch
25750 gitweb: Fix error in "rename to"/"copy to" git diff header output
25751 gitweb: Fix errors in git_patchset_body for empty patches
25752 Revert "gitweb: There can be empty patches (in git_patchset_body)"
25753 gitweb: Fix split patches output (e.g. file to symlink)
25754 gitweb: Remove superfluous "|" in "commit" view
25755 gitweb: Fix git_patchset_body not closing <div class="patch">
25758 get_tree_entry: map blank requested entry to tree root
25761 update hook: redirect _both_ diagnostic lines to stderr upon tag failure
25763 Johannes Schindelin (9):
25764 upload-pack: no longer call rev-list
25765 support fetching into a shallow repository
25766 allow cloning a repository "shallowly"
25767 allow deepening of a shallow repository
25768 add tests for shallow stuff
25769 xdl_merge(): fix a segmentation fault when refining conflicts
25770 Fix yet another subtle xdl_merge() bug
25771 Sanitize for_each_reflog_ent()
25772 Fix t1410 for core.filemode==false
25774 Junio C Hamano (106):
25775 We should make sure that the protocol is still extensible.
25776 Why does it mean we do not have to register shallow if we have one?
25777 Why didn't we mark want_obj as ~UNINTERESTING in the old code?
25778 shallow clone: unparse and reparse an unshallowed commit
25779 add for_each_reflog_ent() iterator
25780 Protect commits recorded in reflog from pruning.
25781 Teach git-repack to preserve objects referred to by reflog entries.
25782 reflog: fix warning message.
25783 Move in_merge_bases() to commit.c
25785 reflog expire: prune commits that are not incomplete
25786 reflog expire: do not punt on tags that point at non commits.
25787 show-branch --reflog: add documentation.
25788 Document --numstat in git-apply and git-diff
25789 Document git-reset <commit> -- <paths>...
25790 Move encoding conversion routine out of mailinfo to utf8.c
25791 i18n.logToUTF8: convert commit log message to UTF-8
25792 Teach log family --encoding
25793 everyday: update for v1.5.0
25794 count-objects -v: show number of packs as well.
25795 rerere gc: honor configuration and document it
25796 git-reflog: gc.* configuration and documentation.
25797 everyday: replace a few 'prune' and 'repack' with 'gc'
25798 Use 'repack -a -d -l' instead of 'repack -a -d' in git-gc
25799 Set NO_MMAP for Cygwin by default
25800 UTF-8: introduce i18n.logoutputencoding.
25801 gcc does not necessarily pass runtime libpath with -R
25802 Work around http-fetch built with cURL 7.16.0
25803 Rename t3900 test vector file
25804 t3900: test conversion to non UTF-8 as well
25805 GIT_SKIP_TESTS: allow users to omit tests that are known to break
25806 core.logallrefupdates: log remotes/ tracking branches.
25807 Allow non-fast-forward of remote tracking branches in default clone
25808 t5400 send-pack test: try a bit more nontrivial transfer.
25809 Revert "read_directory: show_both option."
25810 Fix 'git add' with .gitignore
25811 pack-objects: fix use of use_pack().
25812 mmap: set FD_CLOEXEC for file descriptors we keep open for mmap()
25813 send-pack: fix pipeline.
25814 Documentation: illustrate send-pack pipeline.
25815 commit re-encoding: fix confusion between no and default conversion.
25816 t3900: test log --encoding=none
25817 Documentation: i18n commit log message notes.
25818 Documentation: minor rewording for git-log and git-show pages.
25819 Move commit reencoding parameter parsing to revision.c
25820 commit-tree: cope with different ways "utf-8" can be spelled.
25821 i18n: drop "encoding" header in the output after re-coding.
25822 Documentation/config.txt (and repo-config manpage): mark-up fix.
25823 Update documentation for update hook.
25824 send-pack.c: use is_null_sha1()
25825 send-pack: tell pack-objects to use its internal rev-list.
25826 Do not merge random set of refs out of wildcarded refs
25827 i18n: do not leak 'encoding' header even when we cheat the conversion.
25828 Update send-pack pipeline documentation.
25829 fail pull/merge early in the middle of conflicted merge
25830 git-fetch: remove .keep file at the end.
25831 Strongly discourage --update-head-ok in fetch-options documentation.
25832 Update clone/fetch documentation with --depth (shallow clone) option
25833 Remove unused variable (git-commit.sh)
25834 fetch-pack: do not use lockfile structure on stack.
25835 Fix infinite loop when deleting multiple packed refs.
25836 tutorial: misc updates.
25837 git-verify-tag: make sure we remove temporary file.
25838 pack-check.c::verify_packfile(): don't run SHA-1 update on huge data
25839 rerere: Fix removal of already resolved path.
25841 builtin-prune: memory diet.
25842 Fix timestamp for test-tick
25843 builtin-prune: make file-scope static struct to an argument.
25844 builtin-prune: separate ref walking from reflog walking.
25845 Move traversal of reachable objects into a separate library.
25846 reflog expire --fix-stale
25847 reflog --fix-stale: do not check the same trees and commits repeatedly.
25848 diff-index --cached --raw: show tree entry on the LHS for unmerged entries.
25849 git-reset <tree> -- <path> restores absense of <path> in <tree>
25850 Spell default packedgitlimit slightly differently
25851 Move initialization of log_all_ref_updates
25852 Introduce is_bare_repository() and core.bare configuration variable
25853 git-fetch: allow updating the current branch in a bare repository.
25854 git-status: show detached HEAD
25855 Detached HEAD (experimental)
25856 git-checkout: do not warn detaching HEAD when it is already detached.
25857 git-checkout: rewording comments regarding detached HEAD.
25858 git-checkout: safety when coming back from the detached HEAD state.
25859 git-checkout: fix branch name output from the command
25860 --utf8 is now default for 'git-am'
25861 --prune is now default for 'pack-refs'
25862 rm git-rerere.perl -- it is now a built-in.
25863 merge-base: do not leak commit list
25864 Do not ignore a detected patchfile brokenness.
25865 Fix "Do not ignore a detected patchfile brokenness."
25866 builtin-archive: do not free a tree held by the object layer.
25867 git-checkout: safety check for detached HEAD checks existing refs
25868 git-checkout: handle local changes sanely when detaching HEAD
25869 git-am: should work when "--no-utf8 --utf8" is given
25870 -u is now default for 'git-applymbox'
25871 -u is now default for 'git-mailinfo'.
25872 Makefile: remove $foo when $foo.exe is built/installed.
25873 merge-recursive: do not use on-file index when not needed.
25875 index-pack: write-or-die instead of unchecked write-in-full.
25876 config-set: check write-in-full returns in set_multivar
25877 git-rm: do not fail on already removed file.
25878 git-status: wording update to deal with deleted files.
25879 plug a few leaks in revision walking used in describe.
25883 Clarify syntax and role of git-add in status output
25884 Improve "nothing to commit" part of status output
25885 Support --amend on initial commit in status output
25886 Improve cached content header of status output
25887 Remove unnecessary git-rm --cached reference from status output
25888 send-email: work around double encoding of in-body From field.
25889 Provide better feedback for the untracked only case in status output
25892 Skip excessive blank lines before commit body
25893 Refactor print-functions in builtin-branch
25894 git-branch: show detached HEAD
25896 Linus Torvalds (3):
25897 write-cache: do not leak the serialized cache-tree data.
25898 write_in_full: really write in full or return error on disk full.
25899 Better error messages for corrupt databases
25902 Blame "linenr" link jumps to previous state at "orig_lineno"
25904 Martin Langhoff (6):
25905 cvsimport: skip commits that are too recent
25906 cvsimport: skip commits that are too recent (option and documentation)
25907 cvsimport: document -S and -L options
25908 cvsimport: cleanup temporary cvsps file
25909 cvsserver: detect early of we are up to date and avoid costly rev-list
25910 cvsserver: fix revision number during file adds
25912 Michael Loeffler (1):
25913 git-commit: do not fail to print the diffstat even if there is a file named HEAD
25916 add .mailmap for git-shortlog output with the git repository
25917 Add git-reflog to .gitignore
25918 move git-blame to its place in .gitignore
25919 "init-db" can really be just "init"
25920 Add git-init documentation.
25923 Fix warnings in sha1_file.c - use C99 printf format if available
25926 git-send-email: default value for "From:" field.
25929 Make check target depend on common-cmds.h
25930 Remove shadowing variable from traverse_trees()
25931 Set default "tar" umask to 002 and owner.group to root.root
25933 Robert Fitzsimons (2):
25934 gitweb: Re-enable rev-list --parents for parse_commit.
25935 gitweb: Fix shortlog only showing HEAD revision.
25938 Documentation/tutorial: misc updates
25939 git-tag: add flag to verify a tag
25941 Sasha Khapyorsky (3):
25942 git-svnimport: support for incremental import
25943 git-svnimport: clean svn path when accessing SVN repo
25944 git-svnimport: fix edge revisions double importing
25946 Shawn O. Pearce (49):
25947 Don't crash during repack of a reflog with pruned commits.
25948 Create 'git gc' to perform common maintenance operations.
25949 Use GIT_REFLOG_ACTION environment variable instead.
25950 Honor GIT_REFLOG_ACTION in git-rebase.
25951 Use branch names in 'git-rebase -m' conflict hunks.
25952 Ensure `git-pull` fails if `git-merge` fails.
25953 Honor pull.{twohead,octopus} in git-merge.
25954 Allow git-merge to select the default strategy.
25955 Move better_branch_name above get_ref in merge-recursive.
25956 Allow merging bare trees in merge-recursive.
25957 Use merge-recursive in git-am -3.
25958 Replace unpack_entry_gently with unpack_entry.
25959 Introduce new config option for mmap limit.
25960 Refactor packed_git to prepare for sliding mmap windows.
25961 Use off_t for index and pack file lengths.
25962 Create read_or_die utility routine.
25963 Refactor how we open pack files to prepare for multiple windows.
25964 Replace use_packed_git with window cursors.
25965 Loop over pack_windows when inflating/accessing data.
25966 Document why header parsing won't exceed a window.
25967 Unmap individual windows rather than entire files.
25968 Fully activate the sliding window pack access.
25969 Load core configuration in git-verify-pack.
25970 Ensure core.packedGitWindowSize cannot be less than 2 pages.
25971 Improve error message when packfile mmap fails.
25972 Support unmapping windows on 'temporary' packfiles.
25973 Create pack_report() as a debugging aid.
25974 Test suite for sliding window mmap implementation.
25975 Default core.packdGitWindowSize to 1 MiB if NO_MMAP.
25976 Release pack windows before reporting out of memory.
25977 Replace mmap with xmmap, better handling MAP_FAILED.
25978 Cleanup read_cache_from error handling.
25979 Fix random segfaults in pack-objects.
25980 Force core.filemode to false on Cygwin.
25981 Use PATH_MAX constant for --bare.
25982 Replace "GIT_DIR" with GIT_DIR_ENVIRONMENT.
25983 Automatically detect a bare git repository.
25984 Remove unnecessary argc parameter from run_command_v.
25985 Redirect update hook stdout to stderr.
25986 Use /dev/null for update hook stdin.
25987 Teach Git how to parse standard power of 2 suffixes.
25988 Update packedGit config option documentation.
25989 Add test case for update hooks in receive-pack.
25990 Increase packedGit{Limit,WindowSize} on 64 bit systems.
25991 Don't die in git-http-fetch when fetching packs.
25992 Don't save the commit buffer in git-describe.
25993 Make git-describe a builtin.
25994 Disallow working directory commands in a bare repository.
25995 Chose better tag names in git-describe after merges.
25997 Stefan-W. Hahn (1):
25998 Replacing the system call pread() with lseek()/xread()/lseek() sequence.
26001 Describe git-clone's actual behavior in the summary
26002 Print a more accurate error message when we fail to create a lock file.
26003 Update git-svn manpage to remove the implication that SVN::* is optional.
26006 Fix formatting for urls section of fetch, pull, and push manpages
26007 Fix formatting for urls section of fetch, pull, and push manpages
26010 Version v1.5.0-rc0; changes since v1.4.4.4:
26011 -------------------------------------------
26014 Make perl/ build procedure ActiveState friendly.
26016 Alexandre Julliard (1):
26017 vc-git: Ignore errors caused by a non-existent directory in vc-git-registered.
26019 Andreas Ericsson (2):
26020 ls-files: Give hints when errors happen.
26021 git-diff: Introduce --index and deprecate --cached.
26024 Improve git-prune -n output
26025 Add support to git-branch to show local and remote branches
26026 Use .git/config for storing "origin" shortcut repository
26027 De-emphasise the symbolic link documentation.
26028 Explicitly add the default "git pull" behaviour to .git/config on clone
26029 Colourise git-branch output
26030 Allow subcommand.color and color.subcommand color configuration
26031 git-status always says what branch it's on
26033 Aneesh Kumar K.V (1):
26034 Add config example with respect to branch
26036 Brian Gernhardt (6):
26037 Add --add option to git-repo-config
26038 Make git-diff documentation use [--] when it should.
26039 Add documentation for show-branch --topics
26040 Remove COLLISION_CHECK from Makefile since it's not used.
26041 Keep "git --git-dir" from causing a bus error.
26042 Make git-show-branch options similar to git-branch.
26044 David S. Miller (1):
26045 Pass -M to diff in request-pull
26048 git-svn: handle authentication without relying on cached tokens on disk
26049 git-svn: correctly access repos when only given partial read permissions
26050 git-svn: exit with status 1 for test failures
26051 git-svn: allow SVN:: lib users to track the root of the repository (again)
26052 git-svn: use ~/.subversion config files when using SVN:: libraries
26053 git-svn: enable delta transfers during fetches when using SVN:: libs
26054 git-svn: update tests for recent changes
26055 git-svn: error out when the SVN connection fails during a fetch
26056 git-svn: fix output reporting from the delta fetcher
26057 git-svn: color support for the log command
26058 git-svn: documentation updates
26059 git-svn: fix multi-init
26060 git-svn: avoid network timeouts for long-running fetches
26061 git-svn: extra error check to ensure we open a file correctly
26062 git-svn: use do_switch for --follow-parent if the SVN library supports it
26063 rerere: add clear, diff, and status commands
26064 rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am
26065 git-svn: enable logging of information not supported by git
26066 git-svn: allow dcommit to take an alternate head
26067 git-svn: correctly display fatal() error messages
26068 git-svn: correctly handle packed-refs in refs/remotes/
26069 git-svn: correctly handle "(no author)" when using an authors file
26070 git-svn: convert to using Git.pm
26071 git-svn: remove support for the svn command-line client
26072 git-svn: rename 'commit' command to 'set-tree'
26073 git-cvsserver: fix breakage when calling git merge-file
26074 Remove NO_ACCURATE_DIFF options from build systems
26075 git-svn: enable common fetch/commit options for dcommit
26076 Makefile: add quick-install-doc for installing pre-built manpages
26078 Han-Wen Nienhuys (2):
26079 git-tag: allow empty tag message if -m is given explicitly.
26080 ident.c: Trim hint printed when gecos is empty.
26083 git-cvsimport: add support for CVS pserver method HTTP/1.x proxying
26085 J. Bruce Fields (5):
26086 Documentation: clarify tutorial pull/merge discussion
26087 cvs-migration: improved section titles, better push/commit explanation
26088 Documentation: reorganize cvs-migration.txt
26089 Documentation: update git-clone man page with new behavior
26090 Documentation: simpler shared repository creation
26092 Jakub Narebski (26):
26093 gitweb: Protect against possible warning in git_commitdiff
26094 gitweb: Buffer diff header to deal with split patches + git_patchset_body refactoring
26095 gitweb: Default to $hash_base or HEAD for $hash in "commit" and "commitdiff"
26096 gitweb: New improved formatting of chunk header in diff
26097 gitweb: Add an option to href() to return full URL
26098 gitweb: Refactor feed generation, make output prettier, add Atom feed
26099 gitweb: Finish restoring "blob" links in git_difftree_body
26100 gitweb: Replace SPC with also in tag comment
26101 gitweb: Do not use esc_html in esc_path
26102 gitweb: Use git-show-ref instead of git-peek-remote
26103 gitweb: Add author and committer email extraction to parse_commit
26104 gitweb: Add author and contributor email to Atom feed
26105 gitweb: Use author_epoch for pubdate in gitweb feeds
26106 gitweb: Make project description in projects list link to summary view
26107 gitweb: Fix Atom feed <logo>: it is $logo, not $logo_url
26108 git-clone: Rename --use-immingled-remote option to --no-separate-remote
26109 Document git-diff whitespace flags -b and -w
26110 gitweb: Allow PNG, GIF, JPEG images to be displayed in "blob" view
26111 gitweb: Don't use Content-Encoding: header in git_snapshot
26112 gitweb: Show target of symbolic link in "tree" view
26113 gitweb: Add generic git_object subroutine to display object of any type
26114 gitweb: Hyperlink target of symbolic link in "tree" view (if possible)
26115 gitweb: SHA-1 in commit log message links to "object" view
26116 gitweb: Do not show difftree for merges in "commit" view
26117 gitweb: Add title attribute to ref marker with full ref name
26118 gitweb: Add "next" link to commit view
26121 shortlog: fix segfault on empty authorname
26122 vim syntax: follow recent changes to commit template
26125 Set permissions of each new file before "cvs add"ing it.
26127 Johannes Schindelin (30):
26129 shortlog: do not crash on parsing "[PATCH"
26130 shortlog: read mailmap from ./.mailmap again
26131 shortlog: handle email addresses case-insensitively
26133 shortlog: use pager
26134 sha1_object_info(): be consistent with read_sha1_file()
26135 xdiff: add xdl_merge()
26136 xdl_merge(): fix an off-by-one bug
26137 xdl_merge(): fix thinko
26138 diff -b: ignore whitespace at end of line
26139 xdl_merge(): fix and simplify conflict handling
26140 cvs-migration document: make the need for "push" more obvious
26141 Add builtin merge-file, a minimal replacement for RCS merge
26142 merge-file: support -p and -q; fix compile warnings
26143 Get rid of the dependency on RCS' merge program
26144 merge-recursive: add/add really is modify/modify with an empty base
26145 INSTALL: no need to have GNU diff installed
26146 git-show: grok blobs, trees and tags, too
26147 Document git-merge-file
26148 add a function to rename sections in the config
26149 git-branch: rename config vars branch.<branch>.*, too
26150 Introduce GIT_TEMPLATE_DIR
26151 Use git-merge-file in git-merge-one-file, too
26152 git-tag: support -F <file> option
26153 git-reset --hard: tell the user what the HEAD was reset to
26154 move read_mmfile() into xdiff-interface
26155 Add a test for git-rerere
26156 Make git-rerere a builtin
26157 commit-tree: encourage UTF-8 commit messages.
26159 Josef Weidendorfer (2):
26160 Add branch.*.merge warning and documentation update
26161 Move "no merge candidate" warning into git-pull
26163 Junio C Hamano (115):
26164 upload-pack: stop the other side when they have more roots than we do.
26165 apply --numstat: mark binary diffstat with - -, not 0 0
26166 pack-objects: tweak "do not even attempt delta" heuristics
26167 Store peeled refs in packed-refs file.
26168 remove merge-recursive-old
26169 git-merge: make it usable as the first class UI
26170 merge: allow merging into a yet-to-be-born branch.
26171 Store peeled refs in packed-refs (take 2).
26172 git-fetch: reuse ls-remote result.
26173 git-fetch: fix dumb protocol transport to fetch from pack-pruned ref
26174 git-fetch: allow glob pattern in refspec
26175 refs outside refs/{heads,tags} match less strongly.
26176 Typefix builtin-prune.c::prune_object()
26177 Allow git push to delete remote ref.
26178 gitweb: (style) use chomp without parentheses consistently.
26179 git-clone: stop dumb protocol from copying refs outside heads/ and tags/.
26180 git-branch -D: make it work even when on a yet-to-be-born branch
26181 git-shortlog: fix common repository prefix abbreviation.
26182 git-shortlog: make common repository prefix configurable with .mailmap
26183 git-commit: show --summary after successful commit.
26184 git-fetch: exit with non-zero status when fast-forward check fails
26185 git-fetch: allow forcing glob pattern in refspec
26186 fetch-pack: do not barf when duplicate re patterns are given
26187 grep: do not skip unmerged entries when grepping in the working tree.
26188 git-merge: tighten error checking.
26189 git-merge: do not leak rev-parse output used for checking internally.
26190 cvsimport: style fixup.
26191 git-merge: fix confusion between tag and branch
26192 xmerge: make return value from xdl_merge() more usable.
26193 merge-recursive: use xdl_merge().
26194 read-tree: further loosen "working file will be lost" check.
26195 Loosen "working file will be lost" check in Porcelain-ish
26196 read-tree: document --exclude-per-directory
26197 git-merge: squelch needless error message.
26198 git-merge: fix "fix confusion between tag and branch" for real
26200 git-rerere: add 'gc' command.
26201 Documentation/git-commit: rewrite to make it more end-user friendly.
26202 git-commit: allow --only to lose what was staged earlier.
26203 shortlog: remove "[PATCH]" prefix from shortlog output
26204 shortlog: fix segfault on empty authorname
26205 diff --numstat: show binary with '-' to match "apply --numstat"
26206 add test case for recursive merge
26207 git-push: document removal of remote ref with :<dst> pathspec
26208 Revert "git-diff: Introduce --index and deprecate --cached."
26209 git merge: reword failure message.
26210 spurious .sp in manpages
26211 git-push: accept tag <tag> as advertised.
26212 send-pack: tighten checks for remote names
26213 branch --color: change default color selection.
26214 git-blame: show lines attributed to boundary commits differently.
26215 config documentation: group color items together.
26216 git-svn: allow both diff.color and color.diff
26217 Update git-diff documentation
26218 git-fetch: make it work from within a subdirectory.
26219 git-reset: make it work from within a subdirectory.
26220 git-reset [--mixed] <tree> [--] <paths>...
26221 merge: give a bit prettier merge message to "merge branch~$n"
26222 git-clone: use wildcard specification for tracking branches
26223 git-pull: refuse default merge without branch.*.merge
26224 git-clone: lose the artificial "first" fetch refspec
26225 git-clone: lose the traditional 'no-separate-remote' layout
26226 update-index: make D/F conflict error a bit more verbose.
26227 git-add: remove conflicting entry when adding.
26228 Fix check_file_directory_conflict().
26229 Fix mis-mark-up in git-merge-file.txt documentation
26230 markup fix in svnimport documentation.
26231 rev-list --left-right
26232 Teach all of log family --left-right output.
26233 Make left-right automatic.
26234 Teach show-branch how to show ref-log data.
26235 git-fetch: Avoid reading packed refs over and over again
26236 avoid accessing _all_ loose refs in git-show-ref --verify
26237 show-ref: fix --quiet --verify
26238 show-ref: fix --verify --hash=length
26239 parse-remote::expand_refs_wildcard()
26240 show-ref: fix --exclude-existing
26241 racy-git: documentation updates.
26242 rerere: fix breakage of resolving.
26243 fix testsuite: make sure they use templates freshly built from the source
26244 Teach git-branch to delete tracking branches with -r -d
26245 blame: -b (blame.blankboundary) and --root (blame.showroot)
26246 git-add --interactive
26247 git-add --interactive: hunk splitting
26248 Revert "fix testsuite: make sure they use templates freshly built from the source"
26249 Do not create $GIT_DIR/remotes/ directory anymore.
26250 Use preprocessor constants for environment variable names.
26251 Revert "Make left-right automatic."
26252 fix populate-filespec
26253 config_rename_section: fix FILE* leak
26254 simplify inclusion of system header files.
26255 revision: --skip=<n>
26256 git-add: error out when given no arguments.
26257 compat/inet_ntop: do not use u_int
26258 diff documentation: mostly talk about <commit>
26259 Revert "git-pull: refuse default merge without branch.*.merge"
26260 parse-remote: mark all refs not for merge only when fetching more than one
26261 _XOPEN_SOURCE problem also exists on FreeBSD
26262 commit-tree: do not overflow MAXPARENT
26263 merge and reset: adjust for "reset --hard" messages
26264 default pull: forget about "newbie protection" for now.
26265 Do not support "partial URL shorthand" anymore.
26266 Really fix headers for __FreeBSD__
26267 git-tag: lose exit after die
26268 Allow branch.*.merge to talk about remote tracking branches.
26269 git-add --interactive: add documentation
26270 match_pathspec() -- return how well the spec matched
26271 git-rm: update to saner semantics
26272 t3600: update the test for updated git rm
26273 git-rm: Documentation
26274 read_directory: show_both option.
26275 git-add: add ignored files when asked explicitly.
26276 git-add: warn when adding an ignored file with an explicit request.
26277 git-add -f: allow adding otherwise ignored files.
26281 Add -v and --abbrev options to git-branch
26282 git-branch: add options and tests for branch renaming
26283 rename_ref: use lstat(2) when testing for symlink
26284 git-branch: let caller specify logmsg
26289 Michael Loeffler (1):
26290 git-fetch: ignore dereferenced tags in expand_refs_wildcard
26292 Nicolas Pitre (11):
26293 builtin git-shortlog is broken
26294 pack-objects: remove redundent status information
26295 make 'git add' a first class user friendly interface to the index
26296 change the unpack limit treshold to a saner value
26297 repacked packs should be read-only
26298 make commit message a little more consistent and conforting
26299 make patch_delta() error cases a bit more verbose
26300 make git a bit less cryptic on fetch errors
26301 index-pack usage of mmap() is unacceptably slower on many OSes other than Linux
26302 clarify some error messages wrt unknown object types
26303 checkout: make the message about the need for a new branch a bit clearer
26305 Paul Mackerras (1):
26306 gitk: Fix enabling/disabling of menu items on Mac OS X
26309 config option log.showroot to show the diff of root commits
26312 Make git-clone --use-separate-remote the default
26315 git-clone documentation
26316 Documentation: new option -P for git-svnimport
26317 git-branch -d: do not stop at the first failure.
26318 Documentation/git-branch: new -r to delete remote-tracking branches.
26321 shortlog: remove range check
26323 Robert Fitzsimons (17):
26324 gitweb: Show '...' links in "summary" view only if there are more items
26325 gitweb: Add missing show '...' links change.
26326 gitweb: optimize git_get_last_activity.
26327 gitweb: optimize git_shortlog_body.
26328 gitweb: optimize git_summary.
26329 gitweb: Use rev-list pattern search options.
26330 gitweb: Require a minimum of two character for the search text.
26331 gitweb: Allow search to be disabled from the config file.
26332 gitweb: Paginate commit/author/committer search output
26333 gitweb: Add parse_commits, used to bulk load commit objects.
26334 gitweb: We do longer need the --parents flag in rev-list.
26335 gitweb: Change summary, shortlog actions to use parse_commits.
26336 gitweb: Change log action to use parse_commits.
26337 gitweb: Change header search action to use parse_commits.
26338 gitweb: Change atom, rss actions to use parse_commits.
26339 gitweb: Change history action to use parse_commits.
26340 gitweb: Use rev-list --skip option.
26342 Robin Rosenberg (1):
26343 Make cvsexportcommit work with filenames with spaces and non-ascii characters.
26345 Sean Estabrooks (1):
26346 Update documentation to remove incorrect GIT_DIFF_OPTS example.
26348 Shawn O. Pearce (30):
26349 Teach git-completion.bash how to complete git-merge.
26350 Hide plumbing/transport commands from bash completion.
26351 Teach bash how to complete options for git-name-rev.
26352 Add current branch in PS1 support to git-completion.bash.
26353 Teach bash how to complete git-format-patch.
26354 Teach bash how to complete git-cherry-pick.
26355 Teach bash how to complete git-rebase.
26356 Teach bash about git log/show/whatchanged options.
26357 Support bash completion of refs/remote.
26358 Teach bash about git-repo-config.
26359 Support --strategy=x completion in addition to --strategy x.
26360 Cache the list of merge strategies and available commands during load.
26361 Teach bash about git-am/git-apply and their whitespace options.
26362 Teach bash how to complete long options for git-commit.
26363 Fix broken bash completion of local refs.
26364 Remove uncontested renamed files during merge.
26365 Avoid accessing a slow working copy during diffcore operations.
26366 Provide more meaningful output from 'git init-db'.
26367 Enable reflogs by default in any repository with a working directory.
26368 Teach bash the new features of 'git show'.
26369 Suggest use of "git add file1 file2" when there is nothing to commit.
26370 Align section headers of 'git status' to new 'git add'.
26371 Default GIT_COMMITTER_NAME to login name in recieve-pack.
26372 Suggest 'add' in am/revert/cherry-pick.
26373 Rename imap-send's internal info/warn functions.
26374 Introduce a global level warn() function.
26375 Use extended SHA1 syntax in merge-recursive conflicts.
26376 Display 'theirs' branch name when possible in merge.
26377 Rename gitfakemmap to git_mmap.
26378 Switch git_mmap to use pread.
26380 Terje Sten Bjerkseth (1):
26381 Fix system header problems on Mac OS X
26383 Uwe Kleine-König (1):
26384 Fix documentation copy&paste typo
26387 Version v1.4.4.4; changes since v1.4.4.3:
26388 -----------------------------------------
26390 Johannes Schindelin (1):
26391 diff --check: fix off by one error
26393 Junio C Hamano (3):
26394 spurious .sp in manpages
26395 Fix infinite loop when deleting multiple packed refs.
26396 pack-check.c::verify_packfile(): don't run SHA-1 update on huge data
26399 Version v1.4.4.3; changes since v1.4.4.2:
26400 -----------------------------------------
26403 Clarify fetch error for missing objects.
26405 Brian Gernhardt (1):
26406 Move Fink and Ports check to after config file
26409 no need to install manpages as executable
26412 git-svn: exit with status 1 for test failures
26413 git-svn: correctly display fatal() error messages
26416 Don't use memcpy when source and dest. buffers may overlap
26418 Junio C Hamano (1):
26421 Martin Langhoff (1):
26422 cvsserver: Avoid miscounting bytes in Perl v5.8.x
26424 Shawn O. Pearce (2):
26425 Make sure the empty tree exists when needed in merge-recursive.
26426 Bypass expensive content comparsion during rename detection.
26429 Version v1.4.4.2; changes since v1.4.4.1:
26430 -----------------------------------------
26433 git-blame: fix rev parameter handling.
26436 Increase length of function name buffer
26437 Document git-repo-config --bool/--int options.
26440 git-svn: error out from dcommit on a parent-less commit
26441 git-svn: correctly handle revision 0 in SVN repositories
26442 git-svn: preserve uncommitted changes after dcommit
26443 git-svn: avoid fetching files twice in the same revision
26445 Johannes Schindelin (1):
26446 git-mv: search more precisely for source directory in index
26448 Junio C Hamano (5):
26449 git blame -C: fix output format tweaks when crossing file boundary.
26450 tutorial: talk about user.name early and don't start with commit -a
26451 receive-pack: do not insist on fast-forward outside refs/heads/
26452 unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
26453 git-reset to remove "$GIT_DIR/MERGE_MSG"
26456 archive-zip: don't use sizeof(struct ...)
26459 Version v1.4.4.1; changes since v1.4.4:
26460 ---------------------------------------
26462 Alexandre Julliard (1):
26463 gitweb: Put back shortlog instead of graphiclog in the project list.
26466 Move --pretty options into Documentation/pretty-formats.txt
26469 Run "git repack -a -d" once more at end, if there's 1MB or more of not-packed data.
26471 Johannes Schindelin (1):
26472 Seek back to current filepos when mmap()ing with NO_MMAP
26474 Junio C Hamano (7):
26475 git-checkout: do not allow -f and -m at the same time.
26476 git-checkout: allow pathspec to recover lost working tree directory
26477 convert-objects: set _XOPEN_SOURCE to 600
26478 git-fetch: follow lightweit tags as well.
26479 do_for_each_ref: perform the same sanity check for leftovers.
26480 trust-executable-bit: fix breakage for symlinks
26483 Linus Torvalds (2):
26484 git-pull: allow pulling into an empty repository
26485 "git fmt-merge-msg" SIGSEGV
26488 archive: use setvbuf() instead of setlinebuf()
26490 Paolo Ciarrocchi (2):
26491 Teach SubmittingPatches about git-commit -s
26492 Doc: Make comment about merging in tutorial.txt more clear
26495 Fix git-for-each-refs broken for tags
26496 git-apply: Documentation typo fix
26497 Documentation: Define symref and update HEAD description
26498 Documentation: Correct alternates documentation, document http-alternates
26501 sparse fix: non-ANSI function declaration
26502 sparse fix: Using plain integer as NULL pointer
26503 git-apply: slightly clean up bitfield usage
26504 Document git-runstatus
26507 Version v1.4.4; changes since v1.4.4-rc2:
26508 -----------------------------------------
26511 test-lib.sh: A command dying due to a signal is an unexpected failure.
26512 Catch errors when writing an index that contains invalid objects.
26515 git-update-index(1): fix use of quoting in section title
26517 Junio C Hamano (1):
26520 Robin Rosenberg (1):
26521 Rework cvsexportcommit to handle binary files for all cases.
26524 Version v1.4.4-rc2; changes since v1.4.4-rc1:
26525 ---------------------------------------------
26528 git-svn: avoid printing filenames of files we're not tracking
26529 git-svn: don't die on rebuild when --upgrade is specified
26530 git-svn: fix dcommit losing changes when out-of-date from svn
26532 Jakub Narebski (3):
26533 gitweb: Better git-unquoting and gitweb-quoting of pathnames
26534 gitweb: Use character or octal escape codes (and add span.cntrl) in esc_path
26535 gitweb: New improved patchset view
26537 Junio C Hamano (14):
26538 gitweb: fix disabling of "forks"
26539 gitweb: minimally fix "fork" support.
26540 gitweb: do not give blame link unconditionally in diff-tree view
26541 git-status: quote LF in its output
26542 git-pickaxe: retire pickaxe
26543 gitweb: protect blob and diff output lines from controls.
26544 gitweb: protect commit messages from controls.
26545 gitweb: fix unmatched div in commitdiff
26546 Documentation: move blame examples
26547 git-annotate: no need to exec blame; it is built-in now.
26548 git-annotate: fix -S on graft file with comments.
26549 path-list: fix path-list-insert return value
26550 git-cvsserver: read from git with -z to get non-ASCII pathnames.
26553 OGAWA Hirofumi (1):
26554 gitk: Fix nextfile() and add prevfile()
26557 Nicer error messages in case saving an object to db goes wrong
26559 Robert Shearman (1):
26560 git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
26563 Version v1.4.4-rc1; changes since v1.4.3.5:
26564 -------------------------------------------
26567 Gitweb - provide site headers and footers
26569 Alexandre Julliard (5):
26570 pack-refs: Store the full name of the ref even when packing only tags.
26571 git.el: Added functions for moving to the next/prev unmerged file.
26572 git.el: Added a function to open the current file in another window.
26573 git.el: Move point after the log message header when entering log-edit mode.
26574 git.el: Include MERGE_MSG in the log-edit buffer even when not committing a merge.
26577 Make filenames line up in git-status output
26578 Remove uneccessarily similar printf() from print_ref_list() in builtin-branch
26580 Andy Whitcroft (2):
26581 cvsimport: move over to using git-for-each-ref to read refs.
26582 git-for-each-ref: improve the documentation on scripting modes
26584 Aneesh Kumar K.V (1):
26585 gitweb: Remove extra "/" in path names for git_get_project_list
26587 Christian Couder (12):
26588 Add [-s|--hash] option to Linus' show-ref.
26589 Use Linus' show ref in "git-branch.sh".
26590 Document git-show-ref [-s|--hash] option.
26591 Fix show-ref usage for --dereference.
26592 Add pack-refs and show-ref test cases.
26593 When creating branch c/d check that branch c does not already exists.
26594 Uncomment test case: git branch c/d should barf if branch c exists.
26595 Fix a remove_empty_dir_recursive problem.
26596 Clean up "git-branch.sh" and add remove recursive dir test cases.
26597 Use git-update-ref to delete a tag instead of rm()ing the ref file.
26598 Check that a tag exists using show-ref instead of looking for the ref file.
26599 Do not create tag leading directories since git update-ref does it.
26601 Dennis Stosberg (3):
26602 lock_ref_sha1_basic does not remove empty directories on BSD
26603 Remove bashism from t3210-pack-refs.sh
26604 Bash completion support for aliases
26606 Dmitry V. Levin (1):
26607 git-clone: define die() and use it.
26610 Use memmove instead of memcpy for overlapping areas
26613 git-send-email: do not pass custom Date: header
26614 git-svn: avoid printing filenames of files we're not tracking
26615 git-svn: don't die on rebuild when --upgrade is specified
26617 Jakub Narebski (14):
26618 gitweb: Improve git_print_page_path
26619 gitweb: Add '..' (up directory) to tree view if applicable
26620 gitweb: Get rid of git_print_simplified_log
26621 gitweb: Filter out commit ID from @difftree in git_commit and git_commitdiff
26622 gitweb: Print commit message without title in commitdiff only if there is any
26623 gitweb: Use --no-commit-id in git_commit and git_commitdiff
26624 Documentation: Update information about <format> in git-for-each-ref
26625 gitweb: Move git_get_last_activity subroutine earlier
26626 gitweb: Add "next" link to commitdiff view
26627 gitweb: Secure against commit-ish/tree-ish with the same name as path
26628 gitweb: Use 's' regexp modifier to secure against filenames with LF
26629 gitweb: Use git-for-each-ref to generate list of heads and/or tags
26630 gitweb: Output also empty patches in "commitdiff" view
26631 gitweb: Better support for non-CSS aware web browsers
26634 wt-status: use simplified resolve_ref to find current branch
26635 gitignore: git-pack-refs is a generated file.
26636 gitignore: git-show-ref is a generated file.
26637 git-pickaxe: work properly in a subdirectory.
26640 Don't use $author_name undefined when $from contains no /\s</.
26642 Johannes Schindelin (3):
26643 Fix git-update-index --again
26644 show-branch: mark active branch with a '*' again
26645 Turn on recursive with --summary
26648 Add man page for git-show-ref
26650 Junio C Hamano (96):
26651 Add git-for-each-ref: helper for language bindings
26652 Fix t1400-update-ref test minimally
26653 fsck-objects: adjust to resolve_ref() clean-up.
26654 symbolit-ref: fix resolve_ref conversion.
26655 Add callback data to for_each_ref() family.
26656 Tell between packed, unpacked and symbolic refs.
26657 pack-refs: do not pack symbolic refs.
26658 git-pack-refs --prune
26659 pack-refs: fix git_path() usage.
26660 lock_ref_sha1_basic: remove unused parameter "plen".
26661 Clean-up lock-ref implementation
26662 update-ref: -d flag and ref creation safety.
26663 update a few Porcelain-ish for ref lock safety.
26664 Teach receive-pack about ref-log
26665 receive-pack: call setup_ident before git_config
26667 teach revision walker about --all-match.
26668 git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 1)
26669 ref locking: allow 'foo' when 'foo/bar' used to exist but not anymore.
26670 refs: minor restructuring of cached refs data.
26671 lock_ref_sha1(): do not sometimes error() and sometimes die().
26672 lock_ref_sha1(): check D/F conflict with packed ref when creating.
26673 delete_ref(): delete packed ref
26674 git-branch: remove D/F check done by hand.
26675 show-ref --hash=len, --abbrev=len, and --abbrev
26676 git-fetch: adjust to packed-refs.
26677 Fix refs.c;:repack_without_ref() clean-up path
26678 gitweb: make leftmost column of blame less cluttered.
26679 git-fetch: do not look into $GIT_DIR/refs to see if a tag exists.
26680 pack-refs: use lockfile as everybody else does.
26681 gitweb: prepare for repositories with packed refs.
26682 Revert 954a6183756a073723a7c9fd8d2feb13132876b0
26683 pack-refs: call fflush before fsync.
26684 blame.c: whitespace and formatting clean-up.
26685 git-blame: --show-name (and -f)
26686 git-blame: --show-number (and -n)
26687 blame.c: move code to output metainfo into a separate function.
26688 git-send-email: do not drop custom headers the user prepared
26689 ref-log: allow ref@{count} syntax.
26690 git-send-email: real name with period need to be dq-quoted on From: line
26691 git-blame --porcelain
26692 gitweb: use blame --porcelain
26693 Make git-send-email detect mbox-style patches more readily
26694 core.logallrefupdates create new log file only for branch heads.
26695 git-pack-refs --all
26696 core.logallrefupdates thinko-fix
26697 pack-objects: document --delta-base-offset option
26698 blame: Document and add help text for -f, -n, and -p
26699 gitweb: spell "blame --porcelain" with -p
26700 git-repack: repo.usedeltabaseoffset
26702 gitweb: use for-each-ref to show the latest activity across branches
26703 ref-log: fix D/F conflict coming from deleted refs.
26704 git-pickaxe: blame rewritten.
26705 git-pickaxe -M: blame line movements within a file.
26706 git-pickaxe -C: blame cut-and-pasted lines.
26707 git-pickaxe: pagenate output by default.
26708 git-pickaxe: fix nth_line()
26709 git-pickaxe: improve "best match" heuristics
26710 git-pickaxe: introduce heuristics to avoid "trivial" chunks
26711 git-pickaxe: do not keep commit buffer.
26712 git-pickaxe: do not confuse two origins that are the same.
26713 git-pickaxe: get rid of wasteful find_origin().
26714 git-pickaxe: swap comparison loop used for -C
26715 sha1_name.c: avoid compilation warnings.
26716 t3200: git-branch testsuite update
26717 tests: merge-recursive is usable without Python
26718 merge: loosen overcautious "working file will be lost" check.
26719 merge-recursive: use abbreviated commit object name.
26720 merge-recursive: make a few functions static.
26721 merge-recursive: adjust to loosened "working file clobbered" check
26722 t6022: ignoring untracked files by merge-recursive when they do not matter
26723 Documentation: fix git-format-patch mark-up and link it from git.txt
26724 send-pack --keep: do not explode into loose objects on the receiving end.
26725 git-pickaxe: WIP to refcount origin structure.
26726 git-pickaxe: allow -Ln,m as well as -L n,m
26727 git-pickaxe: refcount origin correctly in find_copy_in_parent()
26728 git-pickaxe: tighten sanity checks.
26729 Revert "send-pack --keep: do not explode into loose objects on the receiving end."
26730 git-pickaxe: split find_origin() into find_rename() and find_origin().
26731 git-pickaxe: cache one already found path per commit.
26732 Introduce a new revision set operator <rev>^!
26733 branch: work in subdirectories.
26734 for-each-ref: "creator" and "creatordate" fields
26735 git-pickaxe: rename detection optimization
26736 git-pickaxe: simplify Octopus merges further
26737 git-pickaxe: re-scan the blob after making progress with -M
26738 git-pickaxe: re-scan the blob after making progress with -C
26739 git-pickaxe: fix origin refcounting
26740 cherry is built-in, do not ship git-cherry.sh
26741 git-blame: add internal statistics to count read blobs.
26742 git-pickaxe: optimize by avoiding repeated read_sha1_file().
26743 Document git-pack-refs and link it to git(7).
26744 git-pickaxe: -L /regexp/,/regexp/
26745 git-pickaxe: allow "-L <something>,+N"
26748 Karl Hasselström (1):
26749 ignore-errors requires cl
26752 Make git-branch a builtin
26753 Fix show-ref usagestring
26755 Linus Torvalds (8):
26756 Add "git show-ref" builtin command
26757 Teach "git checkout" to use git-show-ref
26758 Start handling references internally as a sorted in-memory list
26759 Add support for negative refs
26760 Make ref resolution saner
26761 Enable the packed refs file format
26762 Allow '-' in config variable names
26763 git push: add verbose flag and allow overriding of default target repository
26766 gitweb: blame: print commit-8 on the leading row of a commit-block
26767 gitweb: blame: Mouse-over commit-8 shows author and date
26768 gitweb: blame porcelain: lineno and orig lineno swapped
26769 git-revert with conflicts to behave as git-merge with conflicts
26770 gitweb: esc_html() author in blame
26773 gitweb: start to generate PATH_INFO URLs.
26774 gitweb: warn if feature cannot be overridden.
26776 Matthew Wilcox (1):
26777 Add --dry-run option to git-send-email
26779 Nicolas Pitre (24):
26780 introduce delta objects with offset to base
26781 teach git-unpack-objects about deltas with offset to base
26782 teach git-index-pack about deltas with offset to base
26783 make git-pack-objects able to create deltas with offset to base
26784 make pack data reuse compatible with both delta types
26785 let the GIT native protocol use offsets to delta base when possible
26786 zap a debug remnant
26787 allow delta data reuse even if base object is a preferred base
26788 index-pack: compare only the first 20-bytes of the key.
26789 add the capability for index-pack to read from a stream
26790 enable index-pack streaming capability
26791 make index-pack able to complete thin packs.
26792 add progress status to index-pack
26793 mimic unpack-objects when --stdin is used with index-pack
26794 enhance clone and fetch -k experience
26795 index-pack: minor fixes to comment and function name
26796 missing small substitution
26797 make git-push a bit more verbose
26798 Allow pack header preprocessing before unpack-objects/index-pack.
26799 git-fetch can use both --thin and --keep with fetch-pack now
26800 improve fetch-pack's handling of kept packs
26801 have index-pack create .keep file more carefully
26802 remove .keep pack lock files when done with refs update
26803 git-pack-objects progress flag documentation and cleanup
26806 Fix broken sha1 locking
26807 Fix buggy ref recording
26808 gitweb: Document features better
26809 gitweb: Fix search form when PATH_INFO is enabled
26810 bisect reset: Leave the tree in usable state if git-checkout failed
26811 gitweb: Restore object-named links in item lists
26812 gitweb: Make search type a popup menu
26813 gitweb: Do not automatically append " git" to custom site name
26814 gitweb: Show project's README.html if available
26815 gitweb: Support for 'forks'
26816 gitweb: Fix up bogus $stylesheet declarations
26819 git-archive --format=zip: use default version ID
26820 git-archive --format=zip: add symlink support
26822 Make git-cherry handle root trees
26824 Robert Shearman (2):
26825 git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
26826 git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase.
26828 Robin Rosenberg (2):
26829 Mention that pull can work locally in the synopsis
26830 Swap the porcelain and plumbing commands in the git man page
26833 Remove git-annotate.perl and create a builtin-alias for git-blame
26836 fetch: Misc output cleanup
26837 merge and resolve: Output short hashes and .. in "Updating ..."
26839 Sasha Khapyorsky (2):
26840 git-svnimport.perl: copying directory from original SVN place
26841 git-svnimport: support for partial imports
26843 Sean Estabrooks (1):
26844 Add --global option to git-repo-config.
26847 git-send-email: Document support for local sendmail instead of SMTP server
26848 git-send-email: Read the default SMTP server from the GIT config file
26850 Shawn O. Pearce (15):
26851 Use column indexes in git-cvsserver where necessary.
26852 Allow short pack names to git-pack-objects --unpacked=.
26853 Only repack active packs by skipping over kept packs.
26854 Teach git-index-pack how to keep a pack file.
26855 Remove unused variable in receive-pack.
26856 Move deny_non_fast_forwards handling completely into receive-pack.
26857 Teach receive-pack how to keep pack files based on object count.
26858 Added completion support for git-branch.exe.
26859 Added bash completion support for git-reset.
26860 Added missing completions for show-branch and merge-base.
26861 Only load .exe suffix'd completions on Cygwin.
26862 Bash completion support for remotes in .git/config.
26863 Take --git-dir into consideration during bash completion.
26864 Support bash completion on symmetric difference operator.
26865 Remove more sed invocations from within bash completion.
26868 Version v1.4.3.5; changes since v1.4.3.4:
26869 -----------------------------------------
26872 merge-recursive implicitely depends on trust_executable_bit
26875 git-svn: avoid printing filenames of files we're not tracking
26876 git-svn: don't die on rebuild when --upgrade is specified
26877 git-svn: fix dcommit losing changes when out-of-date from svn
26879 Jakub Narebski (1):
26880 Documentation: Transplanting branch with git-rebase --onto
26883 Fix git-runstatus for repositories containing a file named HEAD
26885 Junio C Hamano (3):
26886 adjust_shared_perm: chmod() only when needed.
26887 path-list: fix path-list-insert return value
26888 git-cvsserver: read from git with -z to get non-ASCII pathnames.
26891 Nicer error messages in case saving an object to db goes wrong
26893 Robert Shearman (1):
26894 git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
26897 remove an unneeded test
26900 Version v1.4.3.4; changes since v1.4.3.3:
26901 -----------------------------------------
26904 Minor grammar fixes for git-diff-index.txt
26905 git-clone documentation didn't mention --origin as equivalent of -o
26907 Christian Couder (3):
26908 Remove --syslog in git-daemon inetd documentation examples.
26909 Documentation: add upload-archive service to git-daemon.
26910 Documentation: add git in /etc/services.
26913 Use memmove instead of memcpy for overlapping areas
26915 J. Bruce Fields (1):
26916 Documentation: updates to "Everyday GIT"
26918 Jakub Narebski (3):
26919 diff-format.txt: Combined diff format documentation supplement
26920 diff-format.txt: Correct information about pathnames quoting in patch format
26921 gitweb: Check git base URLs before generating URL from it
26924 Continue traversal when rev-list --unpacked finds a packed commit.
26926 Johannes Schindelin (1):
26927 link_temp_to_file: call adjust_shared_perm() only when we created the directory
26929 Junio C Hamano (9):
26930 Documentation: clarify refname disambiguation rules.
26931 combine-diff: a few more finishing touches.
26932 combine-diff: fix hunk_comment_line logic.
26933 combine-diff: honour --no-commit-id
26934 Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"
26935 quote.c: ensure the same quoting across platforms.
26936 revision traversal: --unpacked does not limit commit list anymore.
26937 link_temp_to_file: don't leave the path truncated on adjust_shared_perm failure
26938 apply: handle "traditional" creation/deletion diff correctly.
26941 pack-objects doesn't create random pack names
26944 git-cherry: document limit and add diagram
26946 Shawn O. Pearce (3):
26947 Use ULONG_MAX rather than implicit cast of -1.
26948 Remove SIMPLE_PROGRAMS and make git-daemon a normal program.
26949 Remove unsupported C99 style struct initializers in git-archive.
26952 Version v1.4.3.3; changes since v1.4.3.2:
26953 -----------------------------------------
26956 git-svn: fix symlink-to-file changes when using command-line svn 1.4.0
26959 Set $HOME for selftests
26961 Junio C Hamano (5):
26962 Documentation: note about contrib/.
26963 RPM package re-classification.
26964 Refer to git-rev-parse:Specifying Revisions from git.txt
26965 Update cherry documentation.
26966 Documentation/SubmittingPatches: 3+1 != 6
26969 xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines
26972 git-fetch.sh printed protocol fix
26975 Version v1.4.3.2; changes since v1.4.3.1:
26976 -----------------------------------------
26978 Alexandre Julliard (1):
26979 prune-packed: Fix uninitialized variable.
26981 J. Bruce Fields (1):
26982 Make prune also run prune-packed
26984 Jakub Narebski (2):
26985 gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2)
26986 gitweb: Do not esc_html $basedir argument to git_print_tree_entry
26989 git-clone: honor --quiet
26990 xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.
26992 Junio C Hamano (2):
26993 pager: default to LESS=FRSX not LESS=FRS
26994 daemon: do not die on older clients.
26996 Karl Hasselström (1):
26997 git-vc: better installation instructions
27000 Fix usagestring for git-branch
27003 gitweb: Fix setting $/ in parse_commit()
27006 git-merge: show usage if run without arguments
27009 Documentation for the [remote] config
27012 Version v1.4.3.1; changes since v1.4.3:
27013 ---------------------------------------
27015 Junio C Hamano (1):
27016 pager: default to LESS=FRS
27019 Fix typo in show-index.c
27021 Linus Torvalds (1):
27022 git-apply: prepare for upcoming GNU diff -u format change.
27024 Nguyễn Thái Ngọc Duy (2):
27025 Reject hexstring longer than 40-bytes in get_short_sha1()
27026 Add revspec documentation for ':path', ':[0-3]:path' and git-describe
27029 reduce delta head inflated size
27032 Version v1.4.3; changes since v1.4.3-rc3:
27033 -----------------------------------------
27035 Andy Whitcroft (1):
27036 add proper dependancies on the xdiff source
27038 Junio C Hamano (1):
27039 Revert "move pack creation to version 3"
27041 Linus Torvalds (1):
27042 Fix hash function in xdiff library
27045 git-imap-send: Strip smtp From_ header from imap message.
27048 svnimport: Fix broken tags being generated
27051 Make write_sha1_file_prepare() void
27052 Replace open-coded version of hash_sha1_file()
27055 Version v1.4.3-rc3; changes since v1.4.3-rc2:
27056 ---------------------------------------------
27058 Christian Couder (1):
27059 Fix tracing when GIT_TRACE is set to an empty string.
27062 git-svn: multi-init saves and reuses --tags and --branches arguments
27063 git-svn: log command fixes
27064 Documentation/git-svn: document some of the newer features
27065 git-svn: -h(elp) message formatting fixes
27066 commit: fix a segfault when displaying a commit with unreachable parents
27067 git-svn: add a message encouraging use of SVN::* libraries
27068 git-svn: fix commits over svn+ssh://
27069 git-svn: reduce memory usage for large commits
27071 Johannes Schindelin (3):
27072 diff: fix 2 whitespace issues
27073 cvsserver: Show correct letters for modified, removed and added files
27074 cvsserver: fix "cvs diff" in a subdirectory
27076 Junio C Hamano (6):
27077 Add WEBDAV timeout to http-fetch.
27078 git-fetch --update-head-ok typofix
27079 git-pull: we say commit X, not X commit.
27080 git.spec.in: perl subpackage is installed in perl_vendorlib not vendorarch
27081 apply --numstat -z: line termination fix.
27082 t4015: work-around here document problem on Cygwin.
27085 paginate git-diff by default
27088 atomic write for sideband remote messages
27091 Documentation: add missing second colons and remove a typo
27092 Add hash_sha1_file()
27093 Make write_sha1_file_prepare() static
27096 clone: the given repository dir should be relative to $PWD
27099 Version v1.4.3-rc2; changes since v1.4.3-rc1:
27100 ---------------------------------------------
27103 Update the gitweb/README file to include setting the GITWEB_CONFIG environment
27104 Fix usage string to match that given in the man page
27106 Alexandre Julliard (2):
27107 git.el: Fixed inverted "renamed from/to" message.
27108 vc-git.el: Switch to using git-blame instead of git-annotate.
27110 Dennis Stosberg (2):
27111 lock_ref_sha1_basic does not remove empty directories on BSD
27112 Add default values for --window and --depth to the docs
27114 Franck Bui-Huu (1):
27115 Add git-upload-archive to the main git man page
27117 Jakub Narebski (1):
27118 gitweb: Cleanup Git logo and Git logo target generation
27120 Junio C Hamano (9):
27121 Makefile: install and clean merge-recur, still.
27122 git-mv: invalidate the removed path properly in cache-tree
27123 git-push: .git/remotes/ file does not require SP after colon
27124 escape tilde in Documentation/git-rev-parse.txt
27125 tar-tree deprecation: we eat our own dog food.
27126 gitweb: Make the Git logo link target to point to the homepage
27127 git-send-email: avoid uninitialized variable warning.
27128 cherry-pick: make -r the default
27132 gitweb: Escape ESCAPE (\e) character
27133 gitweb: Do not print "log" and "shortlog" redundantly in commit view
27134 gitweb: blame: Minimize vertical table row padding
27137 gitweb: document webserver configuration for common gitweb/repo URLs.
27138 git-commit: cleanup unused function.
27139 git-commit: fix coding style.
27140 test-lib: separate individual test better in verbose mode.
27143 add commit count options to git-shortlog
27146 Show snapshot link in shortlog only if have_snapsho
27147 gitweb: Separate (new) and (deleted) in commitdiff by a space
27148 gitweb: Handle commits with empty commit messages more reasonably
27149 gitweb: [commit view] Do not suppress commitdiff link in root commit
27152 git-tar-tree: don't RUN_SETUP
27154 Robin Rosenberg (1):
27155 Error in test description of t1200-tutorial
27158 gitweb: refactor decode() for utf8 conversion
27161 Version v1.4.3-rc1; changes since v1.4.2.4:
27162 -------------------------------------------
27165 Use const for interpolate arguments
27166 fix daemon.c compilation for NO_IPV6=1
27167 do not discard constness in interp_set_entry value argument
27169 Andy Whitcroft (3):
27170 send-pack: remove remote reference limit
27171 send-pack: switch to using git-rev-list --stdin
27172 svnimport: add support for parsing From: lines for author
27174 Aneesh Kumar K.V (4):
27175 gitweb: Support for snapshot
27176 gitweb: fix snapshot support
27177 gitweb: Make blame and snapshot a feature.
27178 gitweb: Fix git_blame
27181 Patch for http-fetch.c and older curl releases
27183 Christian Couder (8):
27184 Trace into open fd and refactor tracing code.
27185 Trace into a file or an open fd and refactor tracing code.
27186 Update GIT_TRACE documentation.
27187 Fix memory leak in prepend_to_path (git.c).
27188 Move add_to_string to "quote.c" and make it extern.
27189 Fix a memory leak in "connect.c" and die if command too long.
27190 Fix space in string " false" problem in "trace.c".
27191 Remove empty ref directories that prevent creating a ref.
27193 David Rientjes (18):
27194 blame.c return cleanup
27195 builtin-grep.c cleanup
27196 builtin-push.c cleanup
27198 http-push.c cleanup
27199 read-cache.c cleanup
27200 Make pprint_tag void and cleans up call in cmd_cat_file.
27201 Make show_entry void
27202 Make checkout_all void.
27203 Make fsck_dir void.
27204 Make pack_objects void.
27205 Make track_tree_refs void.
27206 Make upload_pack void and remove conditional return.
27207 Make sha1flush void and remove conditional return.
27208 make inline is_null_sha1 global
27209 use appropriate typedefs
27210 remove unnecessary initializations
27211 Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
27213 Dennis Stosberg (10):
27214 "test" in Solaris' /bin/sh does not support -e
27215 Makefile fix for Solaris
27216 Add possibility to pass CFLAGS and LDFLAGS specific to the perl subdir
27217 Solaris has strlcpy() at least since version 8
27218 Look for sockaddr_storage in sys/socket.h
27219 Fix detection of ipv6 on Solaris
27220 Fix compilation with Sun CC
27221 gitweb: Use --git-dir parameter instead of setting $ENV{'GIT_DIR'}
27222 gitweb: Remove forgotten call to git_to_hash
27223 use do() instead of require() to include configuration
27225 Dmitry V. Levin (3):
27226 Make count-objects, describe and merge-tree work in subdirectory
27227 Documentation: Fix broken links
27228 Handle invalid argc gently
27231 pass DESTDIR to the generated perl/Makefile
27232 git-svn: establish new connections on commit after fork
27233 git-svn: recommend rebase for syncing against an SVN repo
27234 git-svn: add the 'dcommit' command
27235 git-svn: stop repeatedly reusing the first commit message with dcommit
27237 Franck Bui-Huu (10):
27238 Add a newline before appending "Signed-off-by: " line
27239 log-tree.c: cleanup a bit append_signoff()
27241 git-archive: wire up TAR format.
27242 git-archive: wire up ZIP format.
27243 Add git-upload-archive
27244 connect.c: finish_connect(): allow null pid parameter
27245 Test return value of finish_connect()
27246 upload-archive: monitor child communication even more carefully.
27247 git-archive: update documentation
27249 Haavard Skinnemoen (1):
27250 git-send-email: Don't set author_not_sender from Cc: lines
27252 Jakub Narebski (138):
27253 gitweb: whitespace cleanup
27254 gitweb: Use list for of open for running git commands, thorougly.
27255 gitweb: simplify git_get_hash_by_path
27256 gitweb: More explicit error messages for open "-|"
27257 gitweb: Cleanup - chomp $line in consistent style
27258 gitweb: Cleanup - chomp @lines in consistent style
27259 gitweb: Add git_page_nav for later use
27260 gitweb: Navbar refactoring - use git_page_nav to generate navigation bar
27261 gitweb: Replace form-feed character by ^L
27262 gitweb: Show project descriptions with utf-8 characters in project list correctly
27263 gitweb: Add "\n" after <br/> in git_page_nav
27264 gitweb: Pager refactoring - use git_get_paging_nav for pagination
27265 gitweb: Remove $project from git_get_paging_nav arguments
27266 gitweb: Headers refactoring - use git_header_div for header divs
27267 gitweb: Remove characters entities entirely when shortening string
27268 gitweb: Ref refactoring - use git_get_referencing for marking tagged/head commits
27269 gitweb: Refactor generation of shortlog, tags and heads body
27270 gitweb: do not quote path for list version of open "-|"
27271 gitweb: Remove characters entities entirely when shortening string -- correction
27272 gitweb: Reordering code and dividing it into categories
27273 gitweb: Refactoring git_project_list
27274 autoconf: Add support for setting SHELL_PATH and PERL_PATH
27275 autoconf: Move site configuration section earlier in configure.ac
27276 autoconf: Add support for setting PYTHON_PATH or NO_PYTHON
27277 autoconf: Check for ll hh j z t size specifiers introduced by C99
27278 autoconf: Typo cleanup, reordering etc.
27279 Copy description of new build configuration variables to configure.ac
27280 autoconf: Set NEEDS_LIBICONV unconditionally if there is no iconv in libc
27281 gitweb: Separate input validation and dispatch, add comment about opml action
27282 gitweb: die_error first (optional) parameter is HTTP status
27283 gitweb: Use undef for die_error to use default first (status) parameter value
27284 gitweb: Don't undefine query parameter related variables before die_error
27285 gitweb: Cleanup and uniquify error messages
27286 gitweb: No periods for error messages
27287 gitweb: No error messages with unescaped/unprotected user input
27288 gitweb: PATH_INFO=/ means no project
27289 gitweb: Inline $rss_link
27290 gitweb: Refactor untabifying - converting tabs to spaces
27291 gitweb: fix commitdiff for root commits
27292 gitweb: Skip nonmatching lines in difftree output, consistently
27293 autoconf: Unset NO_STH and NEED_STH when it is detected not needed
27294 gitweb: Remove unused variables in git_shortlog_body and git_heads
27295 autoconf: Add configure target to main Makefile
27296 autoconf: Error out on --without-shell and --without-perl
27297 autoconf: Improvements in NO_PYTHON/PYTHON_PATH handling
27298 autoconf: Move variables which we always set to config.mak.in
27299 autoconf: It is --without-python, not --no-python
27300 autoconf: Add support for setting CURLDIR, OPENSSLDIR, EXPATDIR
27301 gitweb: Whitespace cleanup - tabs are for indent, spaces are for align
27302 gitweb: Great subroutines renaming
27303 gitweb: Separate ref parsing in git_get_refs_list into parse_ref
27304 gitweb: Refactor printing shortened title in git_shortlog_body and git_tags_body
27305 gitweb: Separate main part of git_history into git_history_body
27306 gitweb: Separate finding project owner into git_get_project_owner
27307 gitweb: Change appereance of marker of refs pointing to given object
27308 gitweb: Skip comments in mime.types like file
27309 gitweb: True fix: Support for the standard mime.types map in gitweb
27310 gitweb: Separate printing difftree in git_commit into git_difftree_body
27311 gitweb: Show project's git URL on summary page
27312 gitweb: Add support for per project git URLs
27313 gitweb: Uniquify version info output, add meta generator in page header
27314 gitweb: Refactor printing commit message
27315 gitweb: Added parse_difftree_raw_line function for later use
27316 gitweb: Use parse_difftree_raw_line in git_difftree_body
27317 gitweb: bugfix: a.list formatting regression
27318 gitweb: Replace some presentational HTML by CSS
27319 gitweb: Whitespace cleanup: realign, reindent
27320 gitweb: Use underscore instead of hyphen to separate words in HTTP headers names
27321 gitweb: Route rest of action subroutines through %actions
27322 gitweb: Use here-doc
27323 gitweb: Drop the href() params which keys are not in %mapping
27324 gitweb: Sort CGI parameters returned by href()
27325 gitweb: Use git-diff-tree patch output for commitdiff
27326 gitweb: Show information about incomplete lines in commitdiff
27327 gitweb: Remove invalid comment in format_diff_line
27328 gitweb: Streamify patch output in git_commitdiff
27329 gitweb: Add git_get_{following,preceding}_references functions
27330 gitweb: Faster return from git_get_preceding_references if possible
27331 gitweb: Add git_get_rev_name_tags function
27332 gitweb: Use git_get_name_rev_tags for commitdiff_plain X-Git-Tag: header
27333 gitweb: Add support for hash_parent_base parameter for blobdiffs
27334 gitweb: Allow for pre-parsed difftree info in git_patchset_body
27335 gitweb: Parse two-line from-file/to-file diff header in git_patchset_body
27336 gitweb: Add invisible hyperlink to from-file/to-file diff header
27337 gitweb: Always display link to blobdiff_plain in git_blobdiff
27338 gitweb: Change here-doc back for style consistency in git_blobdiff
27339 gitweb: Use git-diff-tree or git-diff patch output for blobdiff
27340 gitweb: git_blobdiff_plain is git_blobdiff('plain')
27341 gitweb: Remove git_diff_print subroutine
27342 gitweb: Remove creating directory for temporary files
27343 gitweb: git_annotate didn't expect negative numeric timezone
27344 gitweb: Remove workaround for git-diff bug fixed in f82cd3c
27345 gitweb: Improve comments about gitweb features configuration
27346 gitweb: blobs defined by non-textual hash ids can be cached
27347 gitweb: Fix typo in git_difftree_body
27348 gitweb: Fix typo in git_patchset_body
27349 gitweb: Remove unused git_get_{preceding,following}_references
27350 gitweb: Remove git_to_hash function
27351 gitweb: Use @diff_opts, default ('M'), as git-diff and git-diff-tree paramete
27352 gitweb: Make git_print_log generic; git_print_simplified_log uses it
27353 gitweb: Do not remove signoff lines in git_print_simplified_log
27354 gitweb: Add author information to commitdiff view
27355 gitweb: git_print_log: signoff line is non-empty line
27356 gitweb: Add diff tree, with links to patches, to commitdiff view
27357 gitweb: Add local time and timezone to git_print_authorship
27358 gitweb: Move git-ls-tree output parsing to parse_ls_tree_line
27359 gitweb: Separate printing of git_tree row into git_print_tree_entry
27360 gitweb: Extend parse_difftree_raw_line to save commit info
27361 gitweb: Change the name of diff to parent link in "commit" view to "diff
27362 gitweb: Add GIT favicon, assuming image/png type
27363 gitweb: Correct typo: '==' instead of 'eq' in git_difftree_body
27364 gitweb: Divide page path into directories -- path's "breadcrumbs"
27365 autoconf: Add -liconv to LIBS when NEEDS_LIBICONV
27366 autoconf: Check for subprocess.py
27367 autoconf: Quote AC_CACHE_CHECK arguments
27368 autoconf: Fix copy'n'paste error
27369 autoconf: Set NO_ICONV if iconv is found neither in libc, nor in libiconv
27370 autoconf: Add support for setting NO_ICONV and ICONVDIR
27371 autoconf: Add config.cache to .gitignore
27372 gitweb: Make pickaxe search a feature
27373 gitweb: Paginate history output
27374 gitweb: Use File::Find::find in git_get_projects_list
27375 gitweb: Do not parse refs by hand, use git-peek-remote instead
27376 gitweb: Add git_project_index for generating index.aux
27377 gitweb: Allow for href() to be used for links without project param
27378 gitweb: Add link to "project_index" view to "project_list" page
27379 gitweb: Fix mimetype_guess_file for files with multiple extensions
27380 gitweb: Even more support for PATH_INFO based URLs
27381 gitweb: Require project for almost all actions
27382 gitweb: Always use git-peek-remote in git_get_references
27383 gitweb: Make git_get_refs_list do work of git_get_references
27384 gitweb: Fix thinko in git_tags and git_heads
27385 gitweb: Make git_get_hash_by_path check type if provided
27386 gitweb: Strip trailing slashes from $path in git_get_hash_by_path
27387 gitweb: Use "return" instead of "return undef" for some subs
27388 gitweb: Split validate_input into validate_pathname and validate_refname
27389 gitweb: Add git_url subroutine, and use it to quote full URLs
27390 gitweb: Quote filename in HTTP Content-Disposition: header
27393 gitweb: optionally read config from GITWEB_CONFIG
27394 diff: support custom callbacks for output
27395 Move color option parsing out of diff.c and into color.[ch]
27396 git-commit.sh: convert run_status to a C builtin
27397 git-status: document colorization config options
27398 contrib/vim: add syntax highlighting file for commits
27399 wt-status: remove extraneous newline from 'deleted:' output
27400 rev-list: fix segfault with --{author,committer,grep}
27401 git-repack: allow git-repack to run in subdirectory
27403 Johannes Schindelin (35):
27404 Git.xs: older perl do not know const char *
27405 Status update on merge-recursive in C
27406 Cumulative update of merge-recursive in C
27407 merge-recur: Convert variable names to lower_case
27408 merge-recur: Get rid of debug code
27409 merge-recur: Remove dead code
27410 merge-recur: Fix compiler warning with -pedantic
27411 merge-recur: Cleanup last mixedCase variables...
27412 merge-recur: Explain why sha_eq() and struct stage_data cannot go
27413 merge-recur: fix thinko in unique_path()
27414 read-trees: refactor the unpack_trees() part
27415 read-tree: move merge functions to the library
27416 merge-recur: use the unpack_trees() interface instead of exec()ing read-tree
27417 merge-recur: virtual commits shall never be parsed
27418 merge-recursive: fix rename handling
27419 http-push: avoid fork() by calling merge_bases() directly
27420 merge-recur: do not call git-write-tree
27421 merge-recur: do not setenv("GIT_INDEX_FILE")
27422 merge-recur: if there is no common ancestor, fake empty one
27423 merge-recur: try to merge older merge bases first
27424 merge-recur: do not die unnecessarily
27425 discard_cache(): discard index, even if no file was mmap()ed
27426 Add the --color-words option to the diff options family
27427 builtin-mv: readability patch
27428 unpack-objects: remove unused variable "eof"
27430 Remove uneeded #include
27431 fmt-merge-msg: fix off-by-one bug
27432 Teach runstatus about --untracked
27433 add receive.denyNonFastforwards config variable
27434 receive-pack: plug memory leak in fast-forward checking code.
27435 Document receive.denyNonFastforwards
27436 runstatus: do not recurse into subdirectories if not needed
27437 daemon: default to 256 for HOST_NAME_MAX if it is not defined
27438 diff --stat: ensure at least one '-' for deletions, and one '+' for additions
27441 Add virtualization support to git-daemon
27442 Cleaned up git-daemon virtual hosting support.
27443 Removed memory leaks from interpolation table uses.
27445 Jonas Fonseca (21):
27446 git-apply(1): document missing options and improve existing ones
27447 git-ls-remote(1): document --upload-pack
27448 git-blame(1): mention options in the synopsis and advertise pickaxe
27449 gitk(1): expand the manpage to look less like a template
27450 git(7): put the synopsis in a verse style paragraph
27451 gitview.txt: improve asciidoc markup
27452 git-svn(1): improve asciidoc markup
27453 describe: fix off-by-one error in --abbrev=40 handling
27454 Use PATH_MAX instead of MAXPATHLEN
27455 Use xrealloc instead of realloc
27456 Use fstat instead of fseek
27457 Use xcalloc instead of calloc
27458 Add --relative-date option to the revision interface
27459 git(7): move gitk(1) to the list of porcelain commands
27460 Use xmalloc instead of malloc
27461 Include config.mak.autogen in the doc Makefile
27462 git-rev-list(1): group options; reformat; document more options
27463 git-apply(1): document --unidiff-zero
27464 git-repack(1): document --window and --depth
27465 Fix trivial typos and inconsistencies in hooks documentation
27466 gitk(1): mention --all
27468 Junio C Hamano (125):
27469 Perl interface: add build-time configuration to allow building with -fPIC
27470 Perl interface: make testsuite work again.
27471 perl: fix make clean
27472 Git.pm: tentative fix to test the freshly built Git.pm
27473 Perly Git: arrange include path settings properly.
27474 Makefile: Set USE_PIC on x86-64
27475 Perly git: work around buggy make implementations.
27476 Git.pm: clean generated files.
27477 Perly Git: make sure we do test the freshly built one.
27478 INSTALL: a tip for running after building but without installing.
27479 Work around sed and make interactions on the backslash at the end of line.
27480 upload-pack: use object pointer not copy of sha1 to keep track of has/needs.
27481 upload-pack: lift MAX_NEEDS and MAX_HAS limitation
27482 recur vs recursive: help testing without touching too many stuff.
27483 sha1_file.c: expose map_sha1_file() interface.
27484 pack-objects: reuse deflated data from new-style loose objects.
27485 unpack-objects: read configuration data upon startup.
27486 Makefile: git-merge-recur depends on xdiff libraries.
27487 gitweb: There can be more than two levels of subdirectories
27488 gitweb: an obvious cut and paste error.
27489 gitweb: fix use of uninitialized value.
27490 gitweb: when showing history of a tree, show tree link not blob
27491 gitweb: avoid undefined value warning in print_page_path
27492 gitweb/README: do not bug Kay with gitweb questions anymore
27493 Makefile: gitweb/gitweb.cgi is now generated.
27494 gitweb: do not use @@FOO@@ for replaced tokens
27495 .gitignore: git-merge-recur is a built file.
27496 Make git-checkout-index a builtin
27497 builtins: Makefile clean-up
27498 git.c: Rename NEEDS_PREFIX to RUN_SETUP
27499 autoconf: fix NEEDS_SSL_WITH_CRYPTO
27501 Racy git: avoid having to be always too careful
27502 read-cache: tweak racy-git delay logic
27503 autoconf: clean temporary file mak.append
27504 git-grep: show pathnames relative to the current directory
27505 upload-pack: minor clean-up in multi-ack logic
27506 Fix type of combine-diff.c::show_patch_diff()
27507 Remove combine-diff.c::uninteresting()
27508 t4116 apply --reverse test
27509 git-apply --reverse: simplify reverse option.
27510 git-apply --binary: clean up and prepare for --reverse
27512 Documentation/technical/racy-git.txt
27513 Add check program "git-check-racy"
27514 Remove the "delay writing to avoid runtime penalty of racy-git avoidance"
27515 builtin-grep: remove unused debugging cruft.
27516 builtin-apply --reverse: two bugfixes.
27517 diff.c: make binary patch reversible.
27518 apply --reverse: tie it all together.
27520 git-apply --reject: send rejects to .rej files.
27521 git-apply --verbose
27522 apply --reject: count hunks starting from 1, not 0
27523 Convert memset(hash,0,20) to hashclr(hash).
27524 hashcpy/hashcmp remaining bits.
27525 builtin-grep.c: remove unused debugging piece.
27527 git-apply --reject: finishing touches.
27528 free(NULL) is perfectly valid.
27529 daemon: prepare for multiple services.
27530 daemon: add upload-tar service.
27531 multi-service daemon: documentation
27532 t5710: fix two thinkos.
27533 Constness tightening for move/link_temp_to_file()
27534 consolidate two copies of new style object header parsing code.
27535 pack-objects: re-validate data we copy from elsewhere.
27536 Revert "Convert git-annotate to use Git.pm"
27537 Revert "Git.pm: Introduce fast get_object() method"
27538 Revert "Make it possible to set up libgit directly (instead of from the environment)"
27539 pack-objects: fix thinko in revalidate code
27540 more lightweight revalidation while reusing deflated stream in packing
27541 unpack-objects desperately salvages objects from a corrupt pack
27542 revision.c: allow injecting revision parameters after setup_revisions().
27543 Teach rev-list an option to read revs from the standard input.
27544 Revert "daemon: add upload-tar service."
27545 Make apply --binary a no-op.
27546 diff --binary generates full index on binary files.
27547 Separate object listing routines out of rev-list
27548 pack-objects: run rev-list equivalent internally.
27549 pack-objects: further work on internal rev-list logic.
27550 pack-objects --unpacked=<existing pack> option.
27551 get_sha1_hex() micro-optimization
27552 archive: allow remote to have more formats than we understand.
27553 Move sideband client side support into reusable form.
27554 Move sideband server side support into reusable form.
27555 archive: force line buffered output to stderr
27556 Add --verbose to git-archive
27557 Teach --exec to git-archive --remote
27558 Prepare larger packet buffer for upload-pack protocol.
27559 Add sideband status report to git-archive protocol
27560 upload-archive: monitor child communication more carefully.
27561 builtin-archive.c: rename remote_request() to extract_remote_arg()
27562 pack-objects: document --revs, --unpacked and --all.
27563 http-fetch: fix alternates handling.
27564 unpack-objects -r: call it "recover".
27565 Document git-grep -[Hh]
27566 Define fallback PATH_MAX on systems that do not define one in <limits.h>
27567 Fix git-am safety checks
27568 http-fetch.c: consolidate code to detect missing fetch target
27569 Add ftp:// protocol support for git-http-fetch
27570 t1400: make test debuggable.
27571 apply --unidiff-zero: loosen sanity checks for --unidiff=0 patches
27572 builtin-grep: make pieces of it available as library.
27573 revision traversal: prepare for commit log match.
27574 revision traversal: --author, --committer, and --grep.
27575 repack: use only pack-objects, not rev-list.
27576 Update grep internal for grepping only in head/body
27577 git log: Unify header_filter and message_filter into one.
27578 Make hexval() available to others.
27579 sha1_name.c: understand "describe" output as a valid object name
27580 diff.c: second war on whitespace.
27581 git-apply: second war on whitespace.
27582 Add t5510 to test per branch configuration affecting git-fetch.
27583 Remove upload-tar and make git-tar-tree a thin wrapper to git-archive
27584 Deprecate merge-recursive.py
27585 diff --stat: allow custom diffstat output width.
27586 diff --stat: color output.
27587 An illustration of rev-list --parents --pretty=raw
27588 grep: free expressions and patterns when done.
27589 grep: fix --fixed-strings combined with expression.
27590 Contributed bash completion support for core Git tools.
27591 git-diff -B output fix.
27592 Remove -fPIC which was only needed for Git.xs
27595 Linus Torvalds (10):
27596 Relative timestamps in git log
27597 git-fsck-objects: lacking default references should not be fatal
27598 Fix git-fsck-objects SIGSEGV/divide-by-zero
27599 Add "-h/-H" parsing to "git grep"
27600 Allow multiple "git_path()" uses
27601 git-log --author and --committer are not left-anchored by default
27602 Clean up approxidate() in preparation for fixes
27603 Fix approxidate() to understand more extended numbers
27604 diff --stat=width[,name-width]: allow custom diffstat output width.
27605 Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34
27608 Fix duplicate xmalloc in builtin-add
27611 gitweb: git_tree displays blame based on repository config
27612 gitweb: bugfix: git_commit and git_commitdiff parents
27613 gitweb: blame table row no highlight fix
27614 gitweb: bugfix: commitdiff regression
27615 gitweb: bugfix: git_print_page_path() needs the hash base
27616 gitweb: tree view: eliminate redundant "blob"
27617 gitweb: Remove redundant "tree" link
27618 gitweb: extend blame to show links to diff and previous
27619 Revert "gitweb: extend blame to show links to diff and previous"
27620 gitweb: Remove excessively redundant entries from git_difftree_body
27621 gitweb: Add history and blame to git_difftree_body()
27622 gitweb: "alternate" starts with shade (i.e. 1)
27623 gitweb: Remove redundant "commit" link from shortlog
27624 gitweb: Factor out gitweb_have_snapshot()
27625 gitweb: Add snapshot to shortlog
27626 gitweb: Don't use quotemeta on internally generated strings
27627 gitweb: Remove redundant "commit" from history
27628 gitweb: History: blob and tree are first, then commitdiff, etc
27629 gitweb: tree view: hash_base and hash are now context sensitive
27631 Martin Langhoff (1):
27632 git-repack: create new packs inside $GIT_DIR, not cwd
27635 gitweb: fill in gitweb configuration by Makefile
27636 gitweb: use out-of-line GIT logo.
27637 gitweb: provide function to format the URL for an action link.
27638 gitweb: consolidate action URL generation.
27639 gitweb: continue consolidation of URL generation.
27640 gitweb: support for "fp" parameter.
27641 gitweb: support for / as home_link.
27642 gitweb: fix project list if PATH_INFO=="/".
27643 gitweb: more support for PATH_INFO based URLs
27644 gitweb: fix uninitialized variable warning.
27645 gitweb: fix display of trees via PATH_INFO.
27647 Matthias Kestenholz (6):
27648 Make git-name-rev a builtin
27649 Make git-pack-objects a builtin
27650 Make git-unpack-objects a builtin
27651 Make git-symbolic-ref a builtin
27652 Add gitweb.cgi to .gitignore
27653 Check if pack directory exists prior to descending into it
27655 Matthias Lederhofer (12):
27656 pager: environment variable GIT_PAGER to override PAGER
27657 gitweb: use a hash to lookup the sub for an action
27658 gitweb: require $ENV{'GITWEB_CONFIG'}
27659 gitweb: check if HTTP_ACCEPT is really set
27660 gitweb: fix commitdiff_plain for root commits
27661 gitweb: fix $project usage
27662 gitweb: do not use 'No such directory' error message
27663 gitweb: export options
27664 gitweb: fix warnings in PATH_INFO code and add export_ok/strict_export
27665 gitweb fix validating pg (page) parameter
27666 format-patch: use cwd as default output directory
27667 git-format-patch: fix bug using -o in subdirectories
27670 move pack creation to version 3
27671 many cleanups to sha1_file.c
27673 Paul Mackerras (10):
27674 gitk: Minor cleanups
27675 gitk: Recompute ancestor/descendent heads/tags when rereading refs
27676 gitk: Add a row context-menu item for creating a new branch
27677 gitk: Add a context menu for heads
27678 gitk: Fix a couple of buglets in the branch head menu items
27679 gitk: Add a menu item for cherry-picking commits
27680 gitk: Update preceding/following tag info when creating a tag
27681 gitk: Improve responsiveness while reading and layout out the graph
27682 gitk: Fix some bugs in the new cherry-picking code
27683 diff-index --cc shows a 3-way diff between HEAD, index and working tree.
27686 Fix probing for already installed Error.pm
27687 Delete manuals if compiling without docs
27688 Make perl interface a separate package
27691 Introduce Git.pm (v4)
27692 Git.pm: Implement Git::exec_path()
27693 Git.pm: Call external commands using execv_git_cmd()
27694 Git.pm: Implement Git::version()
27695 Add Error.pm to the distribution
27696 Git.pm: Better error handling
27697 Git.pm: Handle failed commands' output
27698 Git.pm: Enhance the command_pipe() mechanism
27699 Git.pm: Implement options for the command interface
27700 Git.pm: Add support for subdirectories inside of working copies
27701 Convert git-mv to use Git.pm
27702 Git.pm: assorted build related fixes.
27703 Git.pm: Try to support ActiveState output pipe
27704 Git.pm: Swap hash_object() parameters
27705 Git.pm: Fix Git->repository("/somewhere/totally/elsewhere")
27706 Git.pm: Support for perl/ being built by a different compiler
27707 Git.pm: Remove PerlIO usage from Git.xs
27708 Git.pm: Avoid ppport.h
27709 Git.pm: Don't #define around die
27710 Use $GITPERLLIB instead of $RUNNING_GIT_TESTS and centralize @INC munging
27711 Git.pm: Add config() method
27712 Convert git-send-email to use Git.pm
27713 Git.pm: Introduce ident() and ident_person() methods
27714 Make it possible to set up libgit directly (instead of from the environment)
27715 Git.pm: Introduce fast get_object() method
27716 Convert git-annotate to use Git.pm
27717 Eliminate Scalar::Util usage from private-Error.pm
27718 Fix showing of path in tree view
27719 gitweb: Link (HEAD) tree for each project from projects list
27720 gitweb: More per-view navigation bar links
27721 gitweb: Link to tree instead of snapshot in shortlog
27722 gitweb: Link to latest tree from the head line in heads list
27723 gitweb: Link to associated tree from a particular log item in full log view
27724 gitweb: Rename "plain" labels to "raw"
27725 gitweb: Relabel "head" as "HEAD"
27726 Make path in tree view look nicer
27727 gitweb: Fix tree link associated with each commit log entry.
27728 gitweb: Fix @git_base_url_list usage
27729 Fix snapshot link in tree view
27730 Git.pm: Kill Git.xs for now
27731 Deprecate git-resolve.sh
27732 gitweb: Consolidate escaping/validation of query string
27733 gitweb: fix over-eager application of esc_html().
27735 Pierre Habouzit (7):
27736 Fix a comparison bug in diff-delta.c
27737 avoid to use error that shadows the function name, use err instead.
27738 git_dir holds pointers to local strings, hence MUST be const.
27739 missing 'static' keywords
27740 remove ugly shadowing of loop indexes in subloops.
27741 use name[len] in switch directly, instead of creating a shadowed variable.
27742 n is in fact unused, and is later shadowed.
27744 Randal L. Schwartz (1):
27745 builtin-upload-archive.c broken on openbsd
27748 git-verify-pack: make builtin
27750 Add write_or_die(), a helper function
27752 git-cherry: remove unused variable
27753 git-reset: remove unused variable
27754 Add git-zip-tree to .gitignore
27755 git-archive: make compression level of ZIP archives configurable
27756 Use xstrdup instead of strdup in builtin-{tar,zip}-tree.c
27757 git-archive: inline default_parse_extra()
27758 git-tar-tree: devolve git-tar-tree into a wrapper for git-archive
27759 Remove git-zip-tree
27760 Rename builtin-zip-tree.c to archive-zip.c
27761 git-tar-tree: Remove duplicate git_config() call
27762 git-tar-tree: Move code for git-archive --format=tar to archive-tar.c
27764 Robin Rosenberg (2):
27765 Quote arguments to tr in test-lib
27766 Make cvsexportcommit remove files.
27769 Fetch: default remote repository from branch properties
27770 fetch: get the remote branches to merge from the branch properties
27771 Add test for the default merges in fetch.
27772 fetch: Reset remote refs list each time fetch_main is called
27774 Sasha Khapyorsky (3):
27775 Trivial support for cloning and fetching via ftp://.
27776 git-svnimport: Parse log message for Signed-off-by: lines
27777 http/ftp: optionally ask curl to not use EPSV command
27780 Documentation: Fix howto/revert-branch-rebase.html generation
27781 git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1
27783 Shawn O. Pearce (15):
27784 Verify we know how to read a pack before trying to using it.
27785 Remove unnecessary forward declaration of unpack_entry.
27786 Convert memcpy(a,b,20) to hashcpy(a,b).
27787 Convert memcpy(a,b,20) to hashcpy(a,b).
27788 Reorganize/rename unpack_non_delta_entry to unpack_compressed_entry.
27789 Reuse compression code in unpack_compressed_entry.
27790 Cleanup unpack_entry_gently and friends to use type_name array.
27791 Cleanup unpack_object_header to use only offsets.
27792 Convert unpack_entry_gently and friends to use offsets.
27793 Replace uses of strdup with xstrdup.
27794 Allow 'svn fetch' on '(no date)' revisions in Subversion.
27795 Allow '(no author)' in git-svn's authors file.
27796 Ignore executable bit when adding files if filemode=0.
27797 Allow git-checkout when on a non-existant branch.
27798 Corrected copy-and-paste thinko in ignore executable bit test case.
27800 Tilman Sauerbeck (2):
27802 Added support for dropping privileges to git-daemon.
27805 --name-only, --name-status, --check and -s are mutually exclusive
27806 Remove awkward compatibility warts
27809 Be nicer if git executable is not installed
27812 gitweb: configurable home link string
27813 gitweb: Decode long title for link tooltips
27816 Version v1.4.2.4; changes since v1.4.2.3:
27817 -----------------------------------------
27819 Linus Torvalds (1):
27820 Fix hash function in xdiff library
27823 Version v1.4.2.3; changes since v1.4.2.2:
27824 -----------------------------------------
27826 Junio C Hamano (2):
27827 git-mv: invalidate the removed path properly in cache-tree
27828 git-push: .git/remotes/ file does not require SP after colon
27831 Version v1.4.2.2; changes since v1.4.2.1:
27832 -----------------------------------------
27834 Junio C Hamano (2):
27835 Fix git-am safety checks
27836 git-diff -B output fix.
27839 Fix duplicate xmalloc in builtin-add
27842 Version v1.4.2.1; changes since v1.4.2:
27843 ---------------------------------------
27845 Dennis Stosberg (1):
27846 Solaris does not support C99 format strings before version 10
27848 Johannes Schindelin (5):
27849 git-mv: succeed even if source is a prefix of destination
27850 git-mv: add more path normalization
27851 git-mv: special case destination "."
27852 git-mv: fix off-by-one error
27853 builtin-mv: readability patch
27855 Junio C Hamano (2):
27856 finish_connect(): thinkofix
27857 http-fetch: fix alternates handling.
27860 Fix regex pattern in commit-msg
27861 sample commit-msg hook: no silent exit on duplicate Signed-off-by lines
27864 Version v1.4.2; changes since v1.4.2-rc4:
27865 -----------------------------------------
27868 git-svn: correctly kill keyword expansion without munging EOLs
27869 git-svn: bugfix: allow SVN:: lib users to track the root of the repository
27870 git-svn: split the path from the url correctly with limited perms
27872 Junio C Hamano (8):
27873 git-apply: applying a patch to make a symlink shorter.
27874 combine-diff: use color
27876 builtin-apply: remove unused increment
27877 git-sh-setup: do not use repo-config to test the git directory
27878 git-am: give better diagnostics when the patch does not apply during --3way
27879 Better error message when we are unable to lock the index file
27880 t/t4013: fix futzing with the version string.
27882 Matthias Lederhofer (1):
27883 upload-pack: fix timeout in create_pack_file
27885 Paul Mackerras (2):
27886 gitk: Allow the user to set some colors
27887 gitk: Show the currently checked-out head in bold font
27889 Ramsay Allan Jones (1):
27890 Fix header breakage with _XOPEN_SOURCE.
27893 Add has_extension()
27894 git-verify-pack: show usage when no pack was specified
27895 git-verify-pack: more careful path handling
27896 git-verify-pack: insist on .idx extension
27897 git-verify-pack: get rid of while loop
27898 git-verify-pack: free pack after use and a cleanup
27899 git-verify-pack: buffer overrun paranoia
27900 git-verify-pack: no need to count errors
27901 drop length argument of has_extension
27903 Rutger Nijlunsing (2):
27904 http-push: Make WebDAV work with (broken?) default apache2 WebDAV module
27905 Add Documentation/howto/setup-git-server-over-http.txt
27908 Version v1.4.2-rc4; changes since v1.4.2-rc3:
27909 ---------------------------------------------
27912 git-push: allow pushing from subdirectories
27914 Johannes Schindelin (1):
27915 Fix crash when GIT_DIR is invalid
27918 Update git-init-db(1) and documentation of core.sharedRepository
27920 Junio C Hamano (13):
27921 Cygwin needs NO_C99_FORMAT???
27922 Further clean-up: usage() vs die()
27923 Makefile: Cygwin does not seem to need NO_STRLCPY
27925 debugging: XMALLOC_POISON
27926 builtin-mv: fix use of uninitialized memory.
27927 GIT-VERSION-GEN: adjust for ancient git
27928 Documentation: git-status takes the same options as git-commit
27929 Fix tutorial-2.html
27930 check return value from diff_setup_done()
27931 find_unique_abbrev() with len=0 should not abbreviate
27932 make --find-copies-harder imply -C
27933 allow diff.renamelimit to be set regardless of -M/-C
27935 Michael Krelin (1):
27936 handle https:// protocol in git-clone
27938 Ramsay Allan Jones (4):
27939 Fixup command names in some usage strings.
27940 Replace some calls to die(usage_str) with usage(usage_str).
27941 Allow config file to specify Signed-off-by identity in format-patch.
27942 commit walkers: setup_ident() to record correct committer in ref-log.
27945 git-tar-tree: fix minor memory leak
27948 log-tree: show_log() should respect the setting of diffopt->line_termination
27949 annotate: Fix bug when parsing merges with differing real and logical parents.
27951 Uwe Kleine-König (1):
27952 Document rev-list's option --merge
27955 Version v1.4.2-rc3; changes since v1.4.2-rc2:
27956 ---------------------------------------------
27959 Build on Debian GNU/kFreeBSD
27961 Jakub Narebski (11):
27962 Allow INSTALL, bindir, mandir to be set in main Makefile
27963 Rename man1 and man7 variables to man1dir and man7dir
27964 autoconf: Use autoconf to write installation directories to config.mak.autogen
27965 Teach make clean about configure and autoconf
27966 Copy description of build configuration variables to configure.ac
27967 autoconf: Preparing the way for autodetection
27968 autoconf: Checks for typedefs, structures, and compiler characteristics.
27969 autoconf: Checks for some library functions.
27970 autoconf: Checks for libraries
27971 autoconf: Checks for some programs
27972 configure.ac vertical whitespace usage cleanup
27975 git-push: allow -f as an alias for --force
27976 git-push: remove obsolete git-push.sh
27977 Documentation: convert uses of git-link macro to gitlink
27978 git-annotate: remove extraneous debugging line
27980 Johannes Schindelin (16):
27981 Allow an alias to start with "-p"
27982 git wrapper: add --git-dir=<path> and --bare options
27983 git-instaweb: some Apache have mod_cgi builtin
27984 git-instaweb: respect bindir from Makefile
27985 gitweb: fix two warnings
27986 t7001: add test for git-mv dir1 dir2/
27987 git-cvsserver: support multiline commit messages
27988 Extract helper bits from c-merge-recursive work
27989 Make git-mv a builtin
27990 builtin git-mv: support moving directories
27991 instaweb: Be more clear if httpd or the browser fail
27992 cvsserver: imitate git-update-ref when committing
27993 Makefile: ssh-pull.o depends on ssh-fetch.c
27994 Teach git-apply about '-R'
27996 tar-tree: illustrate an obscure feature better
27998 Josef Weidendorfer (1):
27999 Extend testing git-mv for renaming of subdirectories
28001 Junio C Hamano (18):
28002 git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"
28003 t4112: simplify the test and remove unneeded working tree file.
28004 lost-found: use fsck-objects --full
28005 git-reset: detect update-ref error and report it.
28006 log and diff family: honor config even from subdirectories
28007 git-apply -R: binary patches are irreversible for now.
28008 t4103: fix binary patch application test.
28009 git-checkout: allow "checkout HEAD -- path"
28010 Builtins: control the use of pager from the command table.
28011 fetch/clone: mark messages from remote side stand out.
28012 Fix "git diff blob1 blob2" showing the diff in reverse.
28013 read-tree: shadowed variable fix.
28014 Add a couple of subdirectory tests.
28015 diff.c: do not use pathname comparison to tell renames
28016 Show both blob names from "git diff blob1 blob2"
28017 sideband: do not use color, just say "remote:"
28018 Documentation/git.txt: link git-svn and git-instaweb from the main page.
28021 Linus Torvalds (4):
28022 Call setup_git_directory() early
28023 Call setup_git_directory() much earlier
28024 Fix double "close()" in ce_compare_data
28025 Fix up some fallout from "setup_git_directory()" cleanups
28028 gitweb.cgi: Teach git_history() to read hash from $hash_base
28029 gitweb.cgi: Include direct link to "raw" files from "history"
28030 gitweb.cgi: git_blame2: an alternative simple working git blame
28031 gitweb.cgi: git_blame2: Allow back-trekking through commits
28032 gitweb.cgi: Show "raw" head of project link even when $hash is not defined
28033 gitweb.cgi: git_blame2: Revision blocks now have alternating colors
28034 gitweb.cgi: Centralize printing of the page path
28035 gitweb.cgi: git_blame2: slight optimization reading the blame lines
28037 Matthias Kestenholz (3):
28038 Make git-prune-packed a builtin
28039 Make git-repo-config a builtin
28040 use declarations from builtin.h for builtin commands
28042 Matthias Lederhofer (5):
28043 daemon: documentation for --reuseaddr, --detach and --pid-file
28044 setup_git_directory_gently: do not barf when GIT_DIR is given.
28045 git.c: allow alias expansion without a git directory
28046 pager: config variable pager.color
28047 git-grep: document --and, --or, --not, ( and )
28049 Michael S. Tsirkin (1):
28050 mailinfo: accept >From in message header
28052 Michele Ballabio (1):
28053 fixed variable declaration in gitk
28056 Typofix in configure.ac comment.
28057 Quote all calls to GIT_CONF_APPEND_LINE
28058 Set datarootdir in config.mak.in
28061 Remove -d from *-fetch usage strings
28062 Make pull() take some implicit data as explicit arguments
28063 Make pull() support fetching multiple targets at once
28064 Teach git-local-fetch the --stdin switch
28065 Teach git-http-fetch the --stdin switch
28067 Ramsay Allan Jones (7):
28068 Ensure git-clone exits with error if perl script fails.
28069 Fix annotate test script; notice when git-annotate fails.
28070 Fix installation of templates on ancient systems.
28071 New tests and en-passant modifications to mktag.
28072 Add NO_C99_FORMAT to support older compilers.
28073 Fix header breakage due to redefining PATH_MAX.
28074 Remove cmd_usage() routine and re-organize the help/usage code.
28076 Robert Shearman (2):
28077 rebase: Fix the detection of fast-forwarding of the current branch to upstream.
28078 rebase: Make the fast-fowarding message more user-friendly by using branch names instead of SHA1 IDs.
28080 Shawn O. Pearce (1):
28081 Display an error from update-ref if target ref name is invalid.
28084 Version v1.4.2-rc2; changes since v1.4.2-rc1:
28085 ---------------------------------------------
28088 Trivial path optimization test
28090 Alexandre Julliard (5):
28091 git.el: Run git-rerere on commits if the rr-cache directory exists.
28092 git.el: Prepend a slash to the file name when adding to .gitignore.
28093 git.el: Try to reuse an existing buffer when running git-status.
28094 git.el: Put the git customize group in the 'tools' parent group.
28095 show-branch: Fix another performance problem.
28098 gitweb: escape tag comments
28101 typechange tests for git apply (currently failing)
28102 git-svn: fix fetching new directories copies when using SVN:: libs
28105 pack-objects: check pack.window for default window size
28106 Colorize 'commit' lines in log ui
28108 Johannes Schindelin (4):
28109 Fix t4114 on cygwin
28110 Always reset the color _before_ printing out the newline
28111 cvsserver: suppress warnings
28112 cvsserver: avoid warning about active db handles
28115 git-format-patch: Make the second and subsequent mails replies to the first
28116 Add option to enable threading headers
28117 Add option to set initial In-Reply-To/References
28119 Junio C Hamano (8):
28120 fetch/clone: check return status from ls-remote
28121 builtin-log: typefix for recent format-patch changes.
28122 checkout -f failed to check out a file if an existing directory interfered.
28123 apply: check D/F conflicts more carefully.
28124 apply: split out removal and creation into different phases.
28125 apply: handle type-changing patch correctly.
28126 git-fetch: fix --keep vs --thin
28127 unpack-objects: remove stale and confusing comment
28129 Linus Torvalds (1):
28130 sha1_file: add the ability to parse objects in "pack file format"
28132 Lukas Sandström (1):
28133 git-am: Don't accept an mbox on stdin of we already have a .dotest directory
28135 Martin Langhoff (1):
28136 cvsexportcommit - add -a (add author line) flag, cleanup warnings
28138 Matthias Lederhofer (1):
28139 upload-pack: fix timeout in create_pack_file
28142 Substitute xmalloc()+memset(0) with xcalloc().
28145 Defaulting fetch to origin when set in the repo-config
28147 Shawn O. Pearce (1):
28148 Disable linking with Fink or DarwinPorts.
28151 tar-tree: add the "tar.umask" config option
28154 Version v1.4.2-rc1; changes since v1.4.1.1:
28155 -------------------------------------------
28157 A Large Angry SCM (1):
28158 Additional merge-base tests (revised)
28161 Do not use perl in git-commit.sh
28164 Fix some doubled word typos
28165 Fix some doubled word typos
28166 Fix typos involving the word 'commit'
28167 typofix (git-name-rev documentation)
28168 git-send-email: Remove redundant Reply-To header
28169 gitweb: Send XHTML as 'application/xhtml+xml' where possible
28170 gitweb: Include a site name in page titles
28171 gitweb: Make command invocations go through the git wrapper
28172 documentation (urls.txt) typofix
28174 Dennis Stosberg (2):
28175 gitweb: Declare global variables with "our"
28176 gitweb: Declare global variables with "our"
28179 Add git-instaweb, instantly browse the working repo with gitweb
28180 instaweb: fix unportable ';' usage in sed
28181 t8001-annotate: fix a bash-ism in this test
28182 git-svn: avoid fetching files outside of the URL we're tracking
28183 git-svn: migrate out of contrib
28184 builtin-log: respect diff configuration options
28185 diff.c: respect diff.renames config option
28186 templates/hooks--update: replace diffstat calls with git diff --stat
28187 git-svn: fix --file/-F option in commit-diff
28188 tests: Set EDITOR=: and VISUAL=: globally
28189 git-fetch: fix a bashism (==)
28190 git-svn: don't check for migrations/upgrades on commit-diff
28192 Jakub Narebski (3):
28193 send-email: format 2822 datestring ourselves.
28194 Wrap long lines in docstrings in contrib/emacs/git.el
28195 Display help for Git mode after pressing `h' or `?' in *git-status*
28197 Joachim Berdal Haga (2):
28198 Make zlib compression level configurable, and change default.
28199 core.compression documentation formatting fix.
28201 Johannes Schindelin (7):
28202 refactor merge_bases() as preparation to libify merge-base
28203 move get_merge_bases() to core lib.
28204 Makefile: replace ugly and unportable sed invocation
28205 Make git-fmt-merge-msg a builtin
28206 Makefile: export NO_SVN_TESTS
28207 Close the index file between writing and committing
28208 Fix linking for not-so-clever linkers.
28211 Documentation/urls.txt: Use substitution to escape square brackets
28213 Junio C Hamano (49):
28214 Makefile: add framework to verify and bench sha1 implementations.
28215 test-sha1: test hashing large buffer
28216 t4013: add tests for diff/log family output options.
28217 t4013: add more tests around -c and --cc
28218 Fix some more diff options changes.
28219 t4013 test updates for new output code.
28220 combine-diff.c: type sanity.
28221 format-patch: fix diff format option implementation
28222 t4013: add format-patch tests.
28223 t4013: note improvements brought by the new output code.
28224 gitweb: optimize per-file history generation
28225 gitweb: optimize per-file history generation
28226 t4013: add "diff" UI program tests.
28227 builtin-diff: turn recursive on when defaulting to --patch format.
28228 commit.c: do not redefine UNINTERESTING bit.
28229 get_merge_bases: clean up even when there is no common commit.
28230 revert clear-commit-marks for now.
28231 boolean: accept yes and no as well
28232 send-email: do not barf when Term::ReadLine does not like your terminal
28233 t6200: fmt-merge-msg test.
28234 git-grep: fix parsing of pathspec separator '--'
28235 git-grep: fix exit code when we use external grep.
28236 git-grep: use a bit more specific error messages.
28237 Re-fix clear_commit_marks().
28238 git-grep: boolean expression on pattern matching.
28239 git-reset: complain and exit upon seeing an unknown parameter.
28240 mailinfo: assume input is latin-1 on the header as we do for the body
28241 diffcore-rename: try matching up renames without populating filespec first.
28242 builtin-rev-parse.c: constness tightening
28243 show-branch: match documentation and usage
28244 rev-parse documentation: talk about range notation.
28245 git-svn: migrate out of contrib (follow-up)
28246 diff.c: --no-color to defeat diff.color configuration.
28247 Update diff-options and config documentation.
28248 git log -p --merge [[--] paths...]
28249 colored diff: diff.color = auto fix
28250 diff: do not use configuration magic at the core-level
28251 "git -p cmd" to page anywhere
28252 merge-base: update the clean-up postprocessing
28254 Fix grammatical error in git-revert
28255 git-repack: avoid redirecting stderr into git-pack-objects
28256 test-lib: unset GIT_TRACE
28257 t4013 diff format tests update
28258 Adjust t4013 tests to corrected format-patch.
28259 Documentation: Fix ssh://[user@]host.xz URL
28260 builtin-prune.c: forgot TYPE => OBJ changes.
28261 Documentation/Makefile: product depends on asciidoc.conf
28262 show-branch: fix performance problem.
28264 Linus Torvalds (7):
28265 xdiff: generate "anti-diffs" aka what is common to two files
28266 Prepare "git-merge-tree" for future work
28267 Improved three-way blob merging code
28268 Improve git-peek-remote
28269 builtin "git prune"
28270 Make the unpacked object header functions static to sha1_file.c
28271 Remove TYPE_* constant macros and use object_type enums consistently.
28274 gitweb: Enable tree (directory) history display
28275 gitweb: Enable tree (directory) history display
28276 Add "raw" output option to blobs in "tree" view format
28277 gitweb.cgi: Create $git_temp if it doesn't exist
28278 gitweb.cgi: Teach "a=blob" action to know the blob/file mime type
28279 gitweb.css: Use monospace fonts for commits and tree-diff.
28281 Matthias Lederhofer (10):
28282 GIT_TRACE: show which built-in/external commands are executed
28283 change ent to tree in git-diff documentation
28284 git-rev-list: add documentation for --parents, --no-merges
28285 daemon: use a custom die routine with syslog
28286 daemon: if one of the standard fds is missing open it to /dev/null
28287 upload-pack: ignore write errors to stderr
28288 daemon: new option --pid-file=<path> to store the pid
28289 daemon: new option --detach to run git-daemon in background
28290 Documentation about exclude/ignore files
28291 argv created by handle_alias should be NULL terminated
28294 sed -e '/RE/r rfile/' needs space in 'r rfile'
28295 Using 'perl' in *.sh
28298 Assorted typo fixes
28299 Typofix in Makefile comment.
28300 Fix more typos, primarily in the code
28301 Avoid C99 comments, use old-style C comments instead.
28304 git-cvsexportcommit can't handle merge commits correctly
28307 Add get_merge_bases_clean()
28308 Add '...' operator for revisions
28309 Make clear_commit_marks() clean harder
28310 Fold get_merge_bases_clean() into get_merge_bases()
28311 rev-list: free commit_list in ... handler
28313 Robert Shearman (1):
28314 format-patch: Generate a newline between the subject header and the message body
28317 annotate: Support annotation of files on other revisions.
28318 annotate: Correct most merge following to annotate correctly.
28319 Disable color detection during format-patch
28322 Teach rev-parse the ... syntax.
28325 Fix "git-fetch --tags" exit status when nothing has been changed
28327 Shawn O. Pearce (9):
28328 Avoid C99 initializers
28329 Allow user.name and user.email to drive reflog entry.
28330 Record the type of commit operation in the reflog.
28331 Log ref changes made by git-fetch and git-pull.
28332 Log ref changes made by git-merge and git-pull.
28333 Log ref changes made by quiltimport.
28334 Log ref changes made by resolve.
28335 Make lazy mkdir more robust.
28336 Record rebase changes as 'rebase' in the reflog.
28339 Do not drop data from '\0' until eol in patch output
28340 Teach --text option to diff
28341 Teach diff -a as shorthand for --text
28342 Add -a and --text to common diff options help
28343 diff-options: Explain --text and -a
28345 Timo Hirvonen (14):
28346 Merge with_raw, with_stat and summary variables to output_format
28347 Make --raw option available for all diff commands
28348 Set default diff output format after parsing command line
28349 DIFF_FORMAT_RAW is not default anymore
28350 Add msg_sep to diff_options
28351 Don't xcalloc() struct diffstat_t
28352 whatchanged: Default to DIFF_FORMAT_RAW
28353 Print empty line between raw, stat, summary and patch
28354 diff-tree: Use ---\n as a message separator
28355 log --raw: Don't descend into subdirectories by default
28357 GIT_TRACE: fix a mixed declarations and code warning
28358 diff: Support both attributes and colors
28359 diff: Support 256 colors
28362 Fix print-log and diff compatibility with recent vc versions
28365 Mention the [user@] part in documentation of ssh:// urls.
28368 A better-scheduled PPC SHA-1 implementation.
28371 Version v1.4.1.1; changes since v1.4.1:
28372 ---------------------------------------
28374 Junio C Hamano (1):
28375 Makefile: tighten git-http-{fetch,push} dependencies
28377 Linus Torvalds (1):
28378 revision.c: fix "dense" under --remove-empty
28380 Matthias Lederhofer (1):
28381 upload-pack: fix timeout in create_pack_file
28383 Robin Rosenberg (1):
28384 Empty author may be presented by svn as an empty string or a null value.
28387 Version v1.4.1; changes since v1.4.1-rc2:
28388 -----------------------------------------
28391 git-svn: allow a local target directory to be specified for init
28393 Johannes Schindelin (4):
28394 add diff_flush_patch_id() to calculate the patch id
28395 format-patch: introduce "--ignore-if-in-upstream"
28396 t4014: fix for whitespace from "wc -l"
28397 format-patch: use clear_commit_marks() instead of some ad-hockery
28399 Junio C Hamano (6):
28400 git-repack: Be careful when updating the same pack as an existing one.
28401 t4014: add format-patch --ignore-if-in-upstream test
28402 t4014: fix test commit labels.
28403 diff.c: fix get_patch_id()
28405 upload-pack.c: <sys/poll.h> includes <ctype.h> on OpenBSD 3.8
28407 Linus Torvalds (4):
28408 Do not try futile object pairs when repacking.
28409 Abstract out accesses to object hash array
28410 revision.c: --full-history fix.
28411 git object hash cleanups
28414 consider previous pack undeltified object state only when reusing delta data
28415 don't load objects needlessly when repacking
28418 Fix errno usage in connect.c
28420 Robin Rosenberg (1):
28421 Minor documentation fixup.
28424 Version v1.4.1-rc2; changes since v1.4.1-rc1:
28425 ---------------------------------------------
28427 Andreas Ericsson (1):
28428 git wrapper: fix command name in an error message.
28430 Dennis Stosberg (3):
28431 Solaris needs inclusion of signal.h for signal()
28432 Fix pkt-line.h to compile with a non-GCC compiler
28433 Fix expr usage for FreeBSD
28436 rebase: allow --merge option to handle patches merged upstream
28437 rebase: cleanup rebasing with --merge
28438 rebase: allow --skip to work with --merge
28439 git-svn: SVN 1.1.x library compatibility
28440 git-svn: several graft-branches improvements
28441 git-svn: add the commit-diff command
28442 git-svn: add --follow-parent and --no-metadata options to fetch
28443 git-svn: be verbose by default on fetch/commit, add -q/--quiet option
28444 rebase: get rid of outdated MRESOLVEMSG
28445 rebase: check for errors from git-commit
28448 git-commit: allow -e option anywhere on command line
28449 quote.c: silence compiler warnings from EMIT macro
28451 Johannes Schindelin (5):
28452 patch-id: take "commit" prefix as well as "diff-tree" prefix
28453 Teach diff about -b and -w flags
28454 cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}
28455 apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag.
28456 Save errno in handle_alias()
28458 Junio C Hamano (12):
28459 Makefile: do not recompile main programs when libraries have changed.
28460 usage: minimum type fix.
28461 git-pull: abort when fmt-merge-msg fails.
28463 diff --color: use reset sequence when we mean reset.
28464 repo-config: fix printing of bool
28465 diff --color: use $GIT_DIR/config
28466 combine-diff.c: type sanity
28467 connect.c: remove unused parameters from tcp_connect and proxy_connect
28468 connect.c: check the commit buffer boundary while parsing.
28469 t/README: start testing porcelainish
28470 checkout -m: fix read-tree invocation
28472 Linus Torvalds (1):
28475 Martin Langhoff (3):
28476 git-repack -- respect -q and be quiet
28477 cvsimport: setup indexes correctly for ancestors and incremental imports
28478 cvsimport - cleanup of the multi-indexes handling
28480 Matthias Kestenholz (1):
28481 add GIT-CFLAGS to .gitignore
28483 Matthias Lederhofer (1):
28484 correct documentation for git grep
28487 Rename safe_strncpy() to strlcpy().
28490 Customizable error handlers
28493 git-merge: Don't use -p when outputting summary
28495 Make some strings const
28498 git-commit: filter out log message lines only when editor was run.
28501 Version v1.4.1-rc1; changes since v1.4.0:
28502 -----------------------------------------
28505 object-refs: avoid division by zero
28507 David Woodhouse (1):
28508 Log peer address when git-daemon called from inetd
28510 Dennis Stosberg (3):
28511 Make t4101-apply-nonl bring along its patches
28512 Make t8001-annotate and t8002-blame more portable
28513 Fix t8001-annotate and t8002-blame for ActiveState Perl
28515 Eric W. Biederman (3):
28516 Don't parse any headers in the real body of an email message.
28517 Fix git-format-patch -s
28518 Check and document the options to prevent mistakes.
28521 git-svn: t0000: add -f flag to checkout
28522 git-svn: fix handling of filenames with embedded '@'
28523 git-svn: eol_cp corner-case fixes
28524 git-svn: restore original LC_ALL setting (or unset) for commit
28525 git-svn: don't allow commit if svn tree is not current
28526 git-svn: support -C<num> passing to git-diff-tree
28527 git-svn: --branch-all-refs / -B support
28528 git-svn: optimize --branch and --branch-all-ref
28529 git-svn: support manually placed initial trees from fetch
28530 git-svn: Move all git-svn-related paths into $GIT_DIR/svn
28531 git-svn: minor cleanups, extra error-checking
28532 git-svn: add --repack and --repack-flags= options
28533 git-svn: add --shared and --template= options to pass to init-db
28534 git-svn: add some functionality to better support branches in svn
28535 git-svn: add UTF-8 message test
28536 git-svn: add 'log' command, a facsimile of basic `svn log'
28537 git-svn: add support for Perl SVN::* libraries
28538 git-svn: make the $GIT_DIR/svn/*/revs directory obsolete
28539 git-svn: avoid creating some small files
28540 git-svn: fix several small bugs, enable branch optimization
28541 git-svn: Eliminate temp file usage in libsvn_get_file()
28542 git-svn: bugfix and optimize the 'log' command
28543 git-svn: tests no longer fail if LC_ALL is not a UTF-8 locale
28544 git-svn: svn (command-line) 1.0.x compatibility
28545 git-svn: rebuild convenience and bugfixes
28546 git-svn: fix --rmdir when using SVN:: libraries
28547 rebase: Allow merge strategies to be used when rebasing
28548 rebase: error out for NO_PYTHON if they use recursive merge
28549 git-svn: fix commit --edit flag when using SVN:: libraries
28551 Florian Forster (9):
28552 gitweb: Adding a `blame' interface.
28553 gitweb: Make the `blame' interface in gitweb optional.
28554 Remove ranges from switch statements.
28555 Initialize FAMs using `FLEX_ARRAY'.
28556 Don't instantiate structures with FAMs.
28557 Cast pointers to `void *' when used in a format.
28558 Don't use empty structure initializers.
28559 Change types used in bitfields to be `int's.
28560 Remove all void-pointer arithmetic.
28562 Fredrik Kuivinen (1):
28563 blame: Add --time to produce raw timestamps
28565 Jakub Narebski (15):
28566 Update gitweb README: gitweb is now included with git
28567 Move gitweb style to gitweb.css
28568 gitweb: safely output binary files for 'blob_plain' action
28569 gitweb: text files for 'blob_plain' action without charset by default
28570 Fix gitweb stylesheet
28571 Make CSS file gitweb/gitweb.css more readable
28572 gitweb: add type="text/css" to stylesheet link
28573 Fix: Support for the standard mime.types map in gitweb
28574 gitweb: A couple of page title tweaking
28575 gitweb: style done with stylesheet
28576 gitweb: whitespace cleanup
28577 Add git version to gitweb output
28578 Move $gitbin earlier in gitweb.cgi
28579 gitweb: Make use of $PATH_INFO for project parameter
28580 gitweb: whitespace cleanup around '='
28582 Johannes Schindelin (6):
28583 diff options: add --color
28584 Initialize lock_file struct to all zero.
28585 Fix setting config variables with an alternative GIT_CONFIG
28586 Read configuration also from $HOME/.gitconfig
28587 repo-config: Fix late-night bug
28588 git_config: access() returns 0 on success, not > 0
28590 Junio C Hamano (31):
28591 Revert all the rev-list option parsing changes.
28592 Clean-up Geert's similarity fingerprint code.
28593 Extract "log [diff options]" parser out.
28594 whatchanged options parser fix.
28595 Built-in git-whatchanged
28597 Try using Geert similarity code in pack-objects.
28598 Retire rabinpoly fingerprinting code
28599 Fix mismerged update-index from jc/cache-tree branch.
28600 read-tree: --prefix=<path>/ option.
28601 write-tree: --prefix=<path>
28602 read-tree: reorganize bind_merge code.
28603 fetch-pack: give up after getting too many "ack continue"
28604 Fix earlier mismerges.
28605 shared repository: optionally allow reading to "others".
28606 gitk: rereadrefs needs listrefs
28608 t5100: mailinfo and mailsplit tests.
28609 mailinfo: ignore blanks after in-body headers.
28610 fix rfc2047 formatter.
28611 xdiff: minor changes to match libxdiff-0.21
28612 Restore SIGCHLD to SIG_DFL where we care about waitpid().
28613 checkout -f: do not leave untracked working tree files.
28614 upload-pack: avoid sending an incomplete pack upon failure
28615 upload-pack: prepare for sideband message support.
28616 Retire git-clone-pack
28617 upload-pack/fetch-pack: support side-band communication
28618 Add renaming-rebase test.
28619 daemon: send stderr to /dev/null instead of closing.
28620 rebase --merge: fix for rebasing more than 7 commits.
28621 Makefile: do not force unneeded recompilation upon GIT_VERSION changes
28623 Linus Torvalds (9):
28624 Tentative built-in "git show"
28625 gitweb.cgi history not shown
28626 Shrink "struct object" a bit
28627 Move "void *util" from "struct object" into "struct commit"
28628 Some more memory leak avoidance
28629 Remove "refs" field from "struct object"
28630 Add specialized object allocator
28631 Add "named object array" concept
28632 Fix grow_refs_hash()
28634 Lukas Sandström (6):
28635 Make git-write-tree a builtin
28636 Make git-mailsplit a builtin
28637 Make git-mailinfo a builtin
28638 Make git-stripspace a builtin
28639 Make git-update-index a builtin
28640 Make git-update-ref a builtin
28642 Martin Langhoff (3):
28643 cvsimport: ignore CVSPS_NO_BRANCH and impossible branches
28644 cvsimport: complete the cvsps run before starting the import
28645 cvsimport: keep one index per branch during import
28648 date.c: improve guess between timezone offset and year.
28650 Paul Mackerras (1):
28651 Fix PPC SHA1 routine for large input buffers
28654 Implement safe_strncpy() as strlcpy() and use it more.
28657 Support for extracting configuration from different files
28658 Support for the standard mime.types map in gitweb
28661 git-tar-tree: Simplify write_trailer()
28662 git-tar-tree: documentation update
28663 git-tar-tree: no more void pointer arithmetic
28664 Make release tarballs friendlier to older tar versions
28666 Sean Estabrooks (1):
28667 Add a "--notags" option for git-p4import.
28669 Sven Verdoolaege (1):
28670 git-cvsexportcommit.perl: fix typo
28673 gitweb: Use $hash_base as $search_hash if possible
28675 Uwe Kleine-König (1):
28676 Fix possible out-of-bounds array access
28679 auto-detect changed prefix and/or changed build flags
28680 Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.
28683 Version v1.4.0; changes since v1.4.0-rc2:
28684 -----------------------------------------
28686 Horst H. von Brand (1):
28687 Fix formatting of Documentation/git-clone.txt
28689 Junio C Hamano (7):
28690 allow working in repositories with textual symref HEAD
28691 git-clone: fix duplicated "master" in $GIT_DIR/remotes/origin
28692 git-rm: honor -n flag.
28693 builtin-init-db: spell the in-program configuration variable in lowercase.
28694 shared repository - add a few missing calls to adjust_shared_perm().
28695 git-clone: fix --bare over dumb-http
28699 first working version
28776 Make the tag view look like commit header.
28777 allow sorting of index page by project path, owner and age
28778 make index page sorting more visible and increase RSS item count
28779 fix search parsing, later git does not print a trailing space
28780 don't chop_str if adding ... is longer than the original
28781 Show tooltips (like this one :)) containing full titles for truncated commit titles in the summary and shortlog views.
28784 common input validation to allow passing of textual hash id's
28786 translate reference into hash while reading a commit
28787 fix typo in link parameter of git_commit
28789 switch to git-rev-list for commit reading
28791 start searching at the current $hash value
28793 rename "branches" to "heads"
28795 provide filename for "save as" in plaintext views
28796 add Expires: +1d header to commit and commitdiff pages
28799 update the test files to have a diff
28800 escape '+' and ' ' in url's
28801 make ' ' and '+' in filenames some kind of working
28803 escape ' ' with '+' in url's
28804 replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
28806 add missing esc() rename
28812 add broken latin encoding to test file
28813 set logo output to raw mode
28815 allow utf8 characters in url parameter escape
28818 fix quoted filename lookup
28820 fix "rename" output
28826 attach tag to the link
28829 fix leading whitespace in commit text
28831 define default colors
28833 resolve textual hashes when looking up "refs"
28835 fix: Use of uninitialized value
28837 handle utf8 characters from /etc/passwd
28839 remove Christian's email address
28844 check for error return from fork()
28847 Built-in git-get-tar-commit-id
28850 prepend '--' to filelist when calling git-diff-tree
28852 Uwe Kleine-König (1):
28853 Document git-clone --use-separate-remote
28856 Add <author> and <guid> to RSS feed
28859 Version v1.4.0-rc2; changes since v1.4.0-rc1:
28860 ---------------------------------------------
28863 Some doc typo fixes
28864 config.txt grammar, typo, and asciidoc fixes
28865 git-cvsserver asciidoc formatting tweaks
28867 Horst H. von Brand (1):
28868 Cleanup git-send-email.perl:extract_valid_email
28870 Johannes Schindelin (1):
28871 If you have a config containing something like this:
28874 Refactor git_tcp_connect() functions a little.
28877 Misc doc improvements
28878 Document git-ls-tree --fullname
28880 Junio C Hamano (12):
28881 git alias: try alias last.
28882 send-email: be more lenient and just catch obvious mistakes.
28883 send-email: a bit more careful domain regexp.
28884 git-format-patch: add --output-directory long option again
28886 Make index file locking code reusable to others.
28887 refs.c: convert it to use lockfile interface.
28888 ref-log: style fixes.
28889 Documentation: add missing docs make check-docs found.
28890 make clean: remove dist-doc targets.
28891 Documentation: git-ls-tree (typofix)
28892 Documentation: add another example to git-ls-files
28894 Nick Hengeveld (2):
28896 http-fetch: fix possible segfault
28898 Paul Mackerras (12):
28899 gitk: Make a row of controls for controlling highlighting
28900 gitk: Highlight entries in the file list as well
28901 gitk: Highlight paths of interest in tree view as well
28902 gitk: First cut at a search function in the patch/file display window
28903 gitk: Improve the text window search function
28904 gitk: Move "pickaxe" find function to highlight facility
28905 gitk: Fix bug in highlight stuff when no line is selected
28906 gitk: Provide ability to highlight based on relationship to selected commit
28907 gitk: Add a goto next/previous highlighted commit function
28908 gitk: Show nearby tags
28909 gitk: Show branch name(s) as well, if "show nearby tags" is enabled
28910 gitk: Re-read the descendent/ancestor tag & head info on update
28913 Document git aliases support
28914 Documentation: git aliases
28917 Off-by-one error in get_path_prefix(), found by Valgrind
28919 Robert Fitzsimons (1):
28920 builtin-grep: pass ignore case option to external grep
28923 Version v1.4.0-rc1; changes since v1.3.3:
28924 -----------------------------------------
28927 make update-index --chmod work with multiple files and --stdin
28928 remove superflous "const"
28930 Aneesh Kumar K.V (3):
28931 gitview: Add key binding for F5.
28932 gitview: Move the console error messages to message dialog
28933 gitview: Add some useful keybindings.
28935 Björn Engelmann (2):
28936 remove the artificial restriction tagsize < 8kb
28937 add more informative error messages to git-mktag
28939 Catalin Marinas (1):
28940 Add a test-case for git-apply trying to add an ending line
28942 Christian Couder (1):
28943 Builtin git-rev-parse.
28945 Dennis Stosberg (3):
28946 git-write-tree writes garbage on sparc64
28947 git-clean fails on files beginning with a dash
28948 Update documentation for git-format-patch
28950 Dmitry V. Levin (2):
28951 execv_git_cmd: Fix stack buffer overflow.
28952 git_exec_path, execv_git_cmd: ignore empty environment variables
28955 git-cvsimport: Handle "Removed" from pserver
28957 Eric W. Biederman (8):
28958 Implement git-quiltimport
28959 Implement a --dry-run option to git-quiltimport
28960 Make read_one_header_line return a flag not a length.
28961 Move B and Q decoding into check header.
28962 Refactor commit messge handling.
28963 In handle_body only read a line if we don't already have one.
28964 More accurately detect header lines in read_one_header_line
28965 Allow in body headers beyond the in body header prefix.
28968 git-svn: documentation updates
28970 send-email: address expansion for common mailers
28971 Install git-send-email by default
28972 send-email: allow sendmail binary to be used instead of SMTP
28973 send-email: quiet some warnings, reject invalid addresses
28974 commit: allow --pretty= args to be abbreviated
28975 git-svn: starting a 1.1.0-pre development version
28976 git-svn: ignore expansion of svn:keywords
28977 t3300-funny-names: shell portability fixes
28978 tests: Remove heredoc usage inside quotes
28979 t5500-fetch-pack: remove local (bashism) usage.
28980 t6000lib: workaround a possible dash bug
28981 git-svn: t0001: workaround a heredoc bug in old versions of dash
28982 git-svn: remove assertion that broke with older versions of svn
28984 Florian Forster (1):
28985 git-svnimport: Improved detection of merges.
28987 Fredrik Kuivinen (2):
28988 blame: Fix path pruning
28989 Update the documentation for git-merge-base
28991 Horst H. von Brand (4):
28992 Fix some documentation typoes
28993 Documentation: Spelling fixes
28994 Add example xinetd(8) configuration to Documentation/everyday.txt
28995 Fix Documentation/everyday.txt: Junio's workflow
28997 J. Bruce Fields (7):
28998 tutorial: replace "whatchanged" by "log"
28999 tutorial: expanded discussion of commit history
29000 tutorial: add discussion of index file, object database
29001 documentation: mention gitk font adjustment in tutorial
29002 documentation: add brief mention of cat-file to tutorial part I
29003 Documentation: retitle the git-core tutorial
29004 Documentation: fix a tutorial-2 typo
29007 cvsimport: use git-update-index --index-info
29008 cvsimport: cleanup commit function
29009 cvsimport: set up commit environment in perl instead of using env
29010 cat-file: document -p option
29011 cvsimport: avoid "use" with :tag
29012 handle concurrent pruning of packed objects
29013 sha1_file: avoid re-preparing duplicate packs
29016 Don't write directly to a make target ($@).
29018 Johannes Schindelin (25):
29019 builtin-push: resurrect parsing of Push: lines
29020 cache-tree: replace a sscanf() by two strtol() calls
29021 builtin-push: also ask config for remote information
29022 fetch, pull: ask config for remote information
29023 repo-config: fix segfault with no argument.
29024 repo-config: trim white-space before comment
29025 repo-config: support --get-regexp
29026 repo-config: deconvolute logics
29027 fetch, pull: ask config for remote information
29028 Add a conversion tool to migrate remote information into the config
29029 builtin-push: --all and --tags _are_ explicit refspecs
29030 Teach fmt-patch to write individual files.
29031 fmt-patch: output file names to stdout
29032 fmt-patch: implement -o <dir>
29033 Teach fmt-patch about --numbered
29034 Teach fmt-patch about --keep-subject
29035 fmt-patch: understand old <his> notation
29036 Fix users of prefix_path() to free() only when necessary
29037 Fix users of prefix_path() to free() only when necessary
29038 Fix crash when reading the empty tree
29039 diff family: add --check option
29040 fmt-patch: Support --attach
29041 git-format-patch --start-number <n>
29042 send-email: only 'require' instead of 'use' Net::SMTP
29043 format-patch: resurrect extra headers from config
29045 Josef Weidendorfer (1):
29046 gitk: Add a visual tag for remote refs
29048 Junio C Hamano (156):
29049 Fix up default abbrev in setup_revisions() argument parser.
29050 Fix up rev-list option parsing.
29051 Split init_revisions() out of setup_revisions()
29052 rev-list option parser fix.
29053 Built-in git-whatchanged.
29054 Do not fork PAGER=cat
29055 Simplify common default options setup for built-in log family.
29056 log/whatchanged/show - log formatting cleanup.
29057 rev-list --header: output format fix
29058 git.c: LOGSIZE is unused after log printing cleanup.
29059 combine-diff: show diffstat with the first parent.
29060 Fix "git log --stat": make sure to set recursive with --stat.
29061 Tentative built-in format-patch.
29062 sha1_name.c: prepare to make get_tree_entry() reusable from others.
29063 sha1_name.c: no need to include diff.h; tree-walk.h will do.
29064 get_tree_entry(): make it available from tree-walk
29065 Minor tweak on subject line in --pretty=email
29066 diff: move diff.c to diff-lib.c to make room.
29067 Add git-unresolve <paths>...
29068 diff --stat: do not drop rename information.
29069 git-update-index --unresolve
29070 rename internal format-patch wip
29071 Makefile: dependency for builtin-help.o
29072 Add colordiff for git to contrib/colordiff.
29073 Fix "git show --stat"
29076 git-fmt-patch: thinkofix to show [PATCH] properly.
29077 Libified diff-index: backward compatibility fix.
29078 read-cache/write-cache: optionally return cache checksum SHA1.
29080 Update write-tree to use cache-tree.
29081 Invalidate cache-tree entries for touched paths in git-apply.
29082 Use cache-tree in update-index.
29083 Add test-dump-cache-tree
29084 cache-tree: protect against "git prune".
29085 index: make the index file format extensible.
29086 Teach fsck-objects about cache-tree.
29087 cache-tree: sort the subtree entries.
29088 test-dump-cache-tree: report number of subtrees.
29089 Makefile: remove and create libgit.a from scratch.
29090 diff --stat: show complete rewrites consistently.
29091 git-cvsserver: typofixes
29092 t0000-basic: Add ls-tree recursive test back.
29093 Makefile: remove and create xdiff library from scratch.
29094 commit-tree: allow generic object name for the tree as well.
29095 revision parsing: make "rev -- paths" checks stronger.
29096 t0000-basic: more commit-tree tests.
29097 update-index: when --unresolve, smudge the relevant cache-tree entries.
29098 read-tree: teach 1 and 2 way merges about cache-tree.
29099 read-tree: teach 1-way merege and plain read to prime cache-tree.
29100 diff-index: fix compilation warnings.
29101 cache_tree_update: give an option to update cache-tree only.
29102 test-dump-cache-tree: validate the cached data as well.
29103 pack-objects: update size heuristucs.
29104 built-in count-objects.
29105 cache-tree.c: typefix
29107 built-in diff: assorted updates.
29108 builtin-diff.c: die() formatting type fix.
29109 Fix builtin-push to honor Push: lines in remotes file.
29110 Extended SHA1 -- "rev^@" syntax to mean "all parents"
29111 get_sha1(): :path and :[0-3]:path to extract from index.
29112 built-in "git grep"
29113 Use RFC2822 dates from "git fmt-patch".
29114 builtin-grep: wildcard pathspec fixes
29115 builtin-grep: support '-l' option.
29116 builtin-grep: do not use setup_revisions()
29117 fsck-objects: mark objects reachable from cache-tree
29118 builtin-count-objects: make it official.
29119 builtin-diff: call it "git-diff", really.
29120 builtin-log/whatchanged/show: make them official.
29121 show-branch: omit uninteresting merges.
29122 builtin-push: make it official.
29123 builtin-grep: printf %.*s length is int, not ptrdiff_t.
29124 Revert "fetch, pull: ask config for remote information"
29125 builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.
29126 builtin-grep: allow more than one patterns.
29127 builtin-grep: support -c (--count).
29128 builtin-grep: support -w (--word-regexp).
29129 builtin-grep: tighten path wildcard vs tree traversal.
29130 core.prefersymlinkrefs: use symlinks for .git/HEAD
29131 repo-config: readability fixups.
29132 builtin-count-objects: open packs when running -v
29133 Fix test-dump-cache-tree in one-tree disappeared case.
29134 read-tree: invalidate cache-tree entry when a new index entry is added.
29135 cache-tree: a bit more debugging support.
29136 builtin-grep: terminate correctly at EOF
29137 builtin-grep: binary files -a and -I
29138 fsck-objects: do not segfault on missing tree in cache-tree
29139 builtin-grep: -L (--files-without-match).
29140 Makefile: do not link rev-list any specially.
29141 delta: stricter constness
29142 pack-object: squelch eye-candy on non-tty
29144 binary diff: further updates.
29145 update-index --unresolve: work from a subdirectory.
29146 checkout-index: plug memory leak from prefix_path()
29147 update-index: plug memory leak from prefix_path()
29148 update-index --again
29149 update-index --again: take optional pathspecs
29150 binary diff and apply: testsuite.
29151 Teach -f <file> option to builtin-grep.
29152 builtin-grep: documentation
29153 get_sha1() - fix infinite loop on nonexistent stage.
29154 Teach git-clean optional <paths>... parameters.
29155 builtin-grep: tighten argument parsing.
29156 builtin-grep: typofix
29157 builtin-grep: -w fix
29158 builtin-grep: -F (--fixed-strings)
29159 checkout: use --aggressive when running a 3-way merge (-m).
29160 diffstat rename squashing fix.
29161 read-tree -u one-way merge fix to check out locally modified paths.
29162 apply --numstat: show new name, not old name.
29163 builtin-grep: unparse more command line options.
29164 apply --cached: apply a patch without using working tree.
29165 git-am: use apply --cached
29166 builtin-diff: fix comparison between two blobs.
29167 merge-base: Clarify the comments on post processing.
29168 read-tree -m -u: do not overwrite or remove untracked working tree files.
29169 builtin-grep: workaround for non GNU grep.
29170 Revert "builtin-grep: workaround for non GNU grep."
29171 apply --cached: do not check newly added file in the working tree
29172 builtin-add: fix unmatched pathspec warnings.
29173 builtin-diff: do not say files are renamed when blob and file are given
29174 Fix build procedure for builtin-init-db
29175 built-in tar-tree and remote tar-tree
29176 git-format-patch: now built-in.
29177 checkdiff_consume: strtol parameter fix.
29178 git-rebase: use canonical A..B syntax to format-patch
29179 tutorial-2: typofix in examples.
29180 mailinfo: skip bogus UNIX From line inside body
29181 CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.
29182 builtin format-patch: squelch content-type for 7-bit ASCII
29183 diff: minor option combination fix.
29184 fetch-pack: output refs in the order they were given on the command line.
29185 Tutorial #2: broken link fix.
29186 builtin-rm: squelch compiler warnings.
29187 cvsimport: do not barf on creation of an empty file.
29188 apply: force matching at the beginning.
29189 fetch.c: remove an unused variable and dead code.
29190 ls-remote: fix rsync:// to report HEAD
29191 mailinfo: More carefully parse header lines in read_one_header_line()
29192 gitk: start-up bugfix
29193 built-in format-patch: various fixups.
29194 format-patch: -n and -k are mutually exclusive.
29195 Let git-clone to pass --template=dir option to git-init-db.
29196 git-fetch: avoid using "case ... in (arm)"
29197 adjust to the rebased series by Linus.
29198 send-email: do not pass bogus address to local sendmail binary
29199 format-patch --signoff
29200 fetch.c: do not pass uninitialized lock to unlock_ref().
29201 fetch.c: do not call process_tree() from process_tree().
29202 fetch: do not report "same" unless -verbose.
29203 read-tree --reset: update working tree file for conflicted paths.
29204 rev-parse: tighten constness properly.
29206 Linus Torvalds (60):
29207 Common option parsing for "git log --diff" and friends
29208 Tentative built-in "git show"
29209 Fixes for option parsing
29210 Log message printout cleanups
29211 Log message printout cleanups (#2)
29212 Log message printout cleanups (#3): fix --pretty=oneline
29213 Fix uninteresting tags in new revision parsing
29214 get_sha1() shorthands for blob/tree objects
29215 Allow "git repack" users to specify repacking window/depth
29216 git log: don't do merge diffs by default
29217 Split up builtin commands into separate files from git.c
29218 Fix "git help -a" terminal autosizing
29220 Fix "git-log --parents" breakage post v1.3.0
29221 sha1_to_hex() usage cleanup
29222 git diff: support "-U" and "--unified" options properly
29223 Allow one-way tree merge to remove old files
29224 Simplify "git reset --hard"
29225 builtin-grep: use external grep when we can take advantage of it
29226 read-tree --reset -u fix.
29227 Fix silly typo in new builtin grep
29228 Remove old "git-grep.sh" remnants
29229 libify git-ls-files directory traversal
29230 Clean up git-ls-file directory walking library interface
29231 Do "git add" as a builtin
29232 builtin-add: warn on unmatched pathspecs
29233 builtin-grep: workaround for non GNU grep.
29234 Remove old "git-add.sh" remnants
29235 Prevent bogus paths from being added to the index.
29236 Make "git rev-list" be a builtin
29237 Libify the index refresh logic
29238 Move pathspec matching from builtin-add.c into dir.c
29239 Add builtin "git rm" command
29240 cvsimport: repack every kilo-commits.
29241 apply: treat EOF as proper context.
29242 Clean up sha1 file writing
29243 bogus "fatal: Not a git repository"
29244 t1002: use -U0 instead of --unified=0
29245 Fix "--abbrev=xyz" for revision listing
29246 Fix memory leak in "git rev-list --objects"
29247 Don't use "sscanf()" for tree mode scanning
29248 Add raw tree buffer info to "struct tree"
29249 Make "tree_entry" have a SHA1 instead of a union of object pointers
29250 Switch "read_tree_recursive()" over to tree-walk functionality
29251 Remove "tree->entries" tree-entry list from tree parser
29252 Make "struct tree" contain the pointer to the tree buffer
29253 Make "tree_entry" have a SHA1 instead of a union of object pointers
29254 Switch "read_tree_recursive()" over to tree-walk functionality
29255 builtin-read-tree.c: avoid tree_entry_list in prime_cache_tree_rec()
29256 Remove "tree->entries" tree-entry list from tree parser
29257 fsck-objects: avoid unnecessary tree_entry_list usage
29258 Remove unused "zeropad" entry from tree_list_entry
29259 Convert "mark_tree_uninteresting()" to raw tree walker
29260 Convert fetch.c: process_tree() to raw tree walker
29261 Remove last vestiges of generic tree_entry_list
29262 tree_entry(): new tree-walking helper function
29263 read-tree: fix eye-candy.
29264 Fix typo in tutorial-2.txt
29265 rev-list: fix process_tree() conversion.
29266 pack-objects: improve path grouping heuristics.
29268 Lukas Sandström (2):
29269 Make git-check-format-ref a builtin.
29270 SubmittingPatches: The download location of External Editor has moved
29272 Martin Langhoff (7):
29273 git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
29274 cvsserver: use git-rev-list instead of git-log
29275 cvsserver: use git-rev-list instead of git-log
29276 cvsimport: minor fixups
29277 cvsimport: replace anonymous sub ref with a normal sub
29278 cvsimport: introduce -L<imit> option to workaround memory leaks
29279 cvsimport: introduce _fetchfile() method and used a 1M buffer to read()
29282 Transitively read alternatives
29283 test case for transitive info/alternates
29284 clone: don't clone the info/alternates file
29285 git help: remove whatchanged from list of common commands
29286 Documentation/Makefile: remove extra /
29287 Add instructions to commit template.
29290 Added logged warnings for CVS error returns
29291 Many fixes for most operations in Eclipse.
29292 Change to allow subdir updates from Eclipse
29294 Matthias Kestenholz (1):
29295 add documentation for update-index --unresolve
29297 Matthias Lederhofer (1):
29298 git status: skip empty directories, and add -u to show all untracked files
29300 Nick Hengeveld (3):
29301 git-fetch: resolve remote symrefs for HTTP transport
29302 http: prevent segfault during curl handle reuse
29303 builtin-push: don't pass --thin to HTTP transport
29305 Nicolas Pitre (10):
29306 split the diff-delta interface
29307 use delta index data when finding best delta matches
29308 replace adler32 with Rabin's polynomial in diff-delta
29309 tiny optimization to diff-delta
29310 improve diff-delta with sparse and/or repetitive data
29311 improve base85 generated assembly code
29312 fix diff-delta bad memory access
29313 simple euristic for further free packing improvements
29314 pack-object: slightly more efficient
29315 improve depth heuristic for maximum delta size
29317 Paul Mackerras (19):
29318 gitk: Implement multiple views
29319 gitk: Make File->Update work properly again
29320 gitk: Fix various bugs in the view support
29321 gitk: Don't reread git-rev-list output from scratch on view switch
29322 gitk: Remember the view in the history list
29323 gitk: Let git-rev-list do the argument list parsing
29324 gitk: Use git-rev-parse only to identify file/dir names on cmd line
29325 gitk: Implement "permanent" views (stored in ~/.gitk)
29326 gitk: add menu item for editing the current view
29327 gitk: Use a text widget for the file list
29328 gitk: Add a tree-browsing mode
29329 gitk: Basic support for highlighting one view within another
29330 gitk: Fix file list display when files are renamed
29331 gitk: Allow view to specify arbitrary arguments to git-rev-list
29332 gitk: Fix display of "(...)" for parents/children we haven't drawn
29333 Provide a way to flush git-diff-tree's output
29334 gitk: Fix bug where page-up/down wouldn't always work properly
29335 gitk: show_error fix
29336 Make git-diff-tree indicate when it flushes
29339 Add git-quiltimport to .gitignore.
29340 Builtin git-ls-files.
29341 Builtin git-ls-tree.
29342 Builtin git-tar-tree.
29343 Builtin git-read-tree.
29344 Builtin git-commit-tree.
29346 Builtin git-show-branch.
29347 Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree.
29349 Peter Hagervall (1):
29350 Sparse fix for builtin-diff
29353 git-repo-config --list support
29354 Deprecate usage of git-var -l for getting config vars list
29355 Call builtin ls-tree in git-cat-file -p
29358 git-send-email: Add References: headers to emails, in addition to In-Reply-To:
29359 Add support for --bcc to git-send-email.
29360 Fix a bug in email extraction used in git-send-email.
29361 Add a basic test case for git send-email, and fix some real bugs discovered.
29363 Salikh Zakirov (1):
29364 Fixed Cygwin CR-munging problem in mailsplit
29367 Document that "git add" only adds non-ignored files.
29369 Sean Estabrooks (19):
29370 Add --continue and --abort options to git-rebase.
29371 Several trivial documentation touch ups.
29372 Fix up docs where "--" isn't displayed correctly.
29373 Update git-unpack-objects documentation.
29374 Clarify git-cherry documentation.
29375 Another config file parsing fix.
29376 t1300-repo-config: two new config parsing tests.
29377 Add "--branches", "--tags" and "--remotes" options to git-rev-parse.
29378 Make git rebase interactive help match documentation.
29379 Add "--summary" option to git diff.
29380 Convert some "apply --summary" users to "diff --summary".
29381 Strip useless "tags/" prefix from git-tag -l output
29382 Allow pickaxe and diff-filter options to be used by git log.
29383 Avoid segfault in diff --stat rename output.
29384 Change GIT-VERSION-GEN to call git commands with "git" not "git-".
29385 Install git builtins into gitexecdir rather than bindir.
29386 Remove possible segfault in http-fetch.
29387 --summary output should print immediately after stats.
29388 A Perforce importer for git.
29390 Serge E. Hallyn (1):
29391 socksetup: don't return on set_reuse_addr() error
29394 gitk: Display commit messages with word wrap
29396 Shawn O. Pearce (24):
29397 Remove unnecessary local in get_ref_sha1.
29398 Improve abstraction of ref lock/write.
29399 Convert update-ref to use ref_lock API.
29400 Log ref updates to logs/refs/<ref>
29401 Support 'master@2 hours ago' syntax
29402 Fix ref log parsing so it works properly.
29403 General ref log reading improvements.
29404 Added logs/ directory to repository layout.
29405 Force writing ref if it doesn't exist.
29406 Log ref updates made by fetch.
29407 Change 'master@noon' syntax to 'master@{noon}'.
29408 Correct force_write bug in refs.c
29409 Change order of -m option to update-ref.
29410 Include ref log detail in commit, reset, etc.
29411 Create/delete branch ref logs.
29412 Enable ref log creation in git checkout -b.
29413 Reference git-check-ref-format in git-branch.
29414 Elaborate on why ':' is a bad idea in a ref name.
29415 Built git-upload-tar should be ignored.
29416 Verify git-commit provides a reflog message.
29417 Test that git-branch -l works.
29418 Remove unnecessary output from t3600-rm.
29419 Improved pack format documentation.
29420 Allow multiple -m options to git-commit.
29422 Tilman Sauerbeck (1):
29423 Documentation/Makefile: create tarballs for the man pages and html files
29426 Builtin git-init-db
29427 Builtin git-cat-file
29428 gitk: Replace "git-" commands with "git "
29431 NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).
29432 Problem: 'trap...exit' causes error message when /bin/sh is ash.
29435 Do not call 'cmp' with non-existant -q flag.
29436 Document current cvsexportcommit limitations.
29437 Make cvsexportcommit create parent directories as needed.
29440 Version v1.3.3; changes since v1.3.2:
29441 -------------------------------------
29444 include header to define uint32_t, necessary on Mac OS X
29446 Dennis Stosberg (2):
29447 Fix git-pack-objects for 64-bit platforms
29448 Fix compilation on newer NetBSD systems
29450 Dmitry V. Levin (1):
29451 Separate object name errors from usage errors
29454 apply: fix infinite loop with multiple patches with --index
29455 Install git-send-email by default
29457 Johannes Schindelin (1):
29458 repo-config: trim white-space before comment
29460 Junio C Hamano (6):
29461 core.prefersymlinkrefs: use symlinks for .git/HEAD
29462 repo-config: document what value_regexp does a bit more clearly.
29463 Fix repo-config set-multivar error return path.
29464 Documentation: {caret} fixes (git-rev-list.txt)
29465 checkout: use --aggressive when running a 3-way merge (-m).
29466 Fix pack-index issue on 64-bit platforms a bit more portably.
29468 Linus Torvalds (3):
29469 Fix "git diff --stat" with long filenames
29470 revert/cherry-pick: use aggressive merge.
29471 git config syntax updates
29474 clone: keep --reference even with -l -s
29475 repack: honor -d even when no new pack was created
29477 Matthias Lederhofer (1):
29478 core-tutorial.txt: escape asterisk
29481 Release config lock if the regex is invalid
29483 Sean Estabrooks (3):
29484 Fix for config file section parsing.
29485 Another config file parsing fix.
29486 Ensure author & committer before asking for commit message.
29489 read-cache.c: use xcalloc() not calloc()
29492 Version v1.3.2; changes since v1.3.1:
29493 -------------------------------------
29496 git-format-patch: Use rfc2822 compliant date.
29499 Alphabetize the glossary.
29500 Added definitions for a few words:
29501 Add a few more words to the glossary.
29503 Junio C Hamano (4):
29505 commit-tree.c: check_valid() microoptimization.
29506 verify-pack: check integrity in a saner order.
29507 git-am --resolved: more usable error message.
29509 Linus Torvalds (1):
29510 Fix filename verification when in a subdirectory
29512 Martin Langhoff (1):
29513 git-send-email: fix version string to be valid perl
29515 Matthias Kestenholz (3):
29516 annotate: fix warning about uninitialized scalar
29517 annotate: display usage information if no filename was given
29518 fix various typos in documentation
29520 Robert Shearman (1):
29521 Give the user a hint for how to continue in the case that git-am fails because it requires user intervention
29523 Sean Estabrooks (4):
29524 Update the git-branch man page to include the "-r" option,
29525 Fix up remaining man pages that use asciidoc "callouts".
29526 Properly render asciidoc "callouts" in git man pages.
29527 Fix trivial typo in git-log man page.
29530 Version v1.3.1; changes since v1.3.0:
29531 -------------------------------------
29534 Fix filename scaling for binary files
29536 Junio C Hamano (5):
29537 git-merge: a bit more readable user guidance.
29538 pre-commit hook: complain about conflict markers.
29539 git-commit --amend: two fixes.
29540 pack-objects: do not stop at object that is "too small"
29541 mailinfo: decode underscore used in "Q" encoding properly.
29543 Linus Torvalds (1):
29544 git-log produces no output
29547 fix pack-object buffer size
29549 Paul Mackerras (1):
29550 rev-parse: better error message for ambiguous arguments
29553 Document git-var -l listing also configuration variables
29554 Document the configuration file
29557 Reintroduce svn pools to solve the memory leak.
29559 Serge E. Hallyn (1):
29560 socksetup: don't return on set_reuse_addr() error
29562 Shawn O. Pearce (1):
29563 Document git-clone --reference
29566 Version v1.3.0; changes since v1.3.0-rc4:
29567 -----------------------------------------
29569 A Large Angry SCM (1):
29572 Herbert Valerio Riedel (1):
29573 git-svnimport symlink support
29575 Johannes Schindelin (2):
29576 diff-options: add --patch-with-stat
29577 pager: do not fork a pager if PAGER is set to empty.
29580 Add git-annotate(1) and git-blame(1)
29582 Junio C Hamano (9):
29583 rev-list --bisect: limit list before bisecting.
29584 diff-tree: typefix.
29585 diff --stat: do not do its own three-dashes.
29586 diff-files --stat: do not dump core with unmerged index.
29587 reading $GIT_DIR/info/graft - skip comments correctly.
29588 rev-list --boundary: show boundary commits even when limited otherwise.
29589 packed_object_info_detail(): check for corrupt packfile.
29590 diff --stat: make sure to set recursive.
29593 Linus Torvalds (1):
29594 Support "git cmd --help" syntax
29596 Paul Mackerras (1):
29597 gitk: Fix bug caused by missing commitlisted elements
29599 Serge E. Hallyn (5):
29600 cleanups: Fix potential bugs in connect.c
29601 cleanups: Remove unused vars from combine-diff.c
29602 cleanups: Remove impossible case in quote.c
29603 cleanups: prevent leak of two strduped strings in config.c
29604 cleanups: remove unused variable from exec_cmd.c
29607 Allow empty lines in info/grafts
29610 Version v1.3.0-rc4; changes since v1.3.0-rc3:
29611 ---------------------------------------------
29613 Davide Libenzi (1):
29614 xdiff: post-process hunks to make them consistent.
29616 Dennis Stosberg (2):
29617 Solaris 9 also wants our own unsetenv/setenv.
29618 Replace index() with strchr().
29620 Eric W. Biederman (1):
29621 Implement limited context matching in git-apply.
29623 Johannes Schindelin (2):
29624 diff-options: add --stat (take 2)
29625 diff-options: add --stat (take 2)
29627 Junio C Hamano (31):
29628 git-log: match rev-list --abbrev and --abbrev-commit
29629 diff: fix output of total-rewrite diff.
29630 diffcore-rename: fix merging back a broken pair.
29631 log-tree: separate major part of diff-tree.
29632 git log [diff-tree options]...
29633 Retire diffcore-pathspec.
29634 tree-diff: do not assume we use only one pathspec
29635 git log --full-diff
29637 blame and friends: adjust to multiple pathspec change.
29638 Retire git-log.sh (take#2)
29639 diff-* --patch-with-raw
29640 Retire git-log.sh (take #3)
29641 combine-diff: do not lose hunks with only deletion at end.
29642 combine-diff: fix hunks at the end (take #2).
29643 Retire t5501-old-fetch-and-upload test.
29644 git-commit: do not muck with commit message when no_edit is set.
29645 stripspace: make sure not to leave an incomplete line.
29646 combine-diff: type fix.
29647 Documentation: add a couple of missing docs.
29648 Makefile: $(MAKE) check-docs
29649 git-log: do not output excess blank line between commits
29650 t3600-rm: skip failed-remove test when we cannot make an unremovable file.
29651 Fix-up previous expr changes.
29652 diff --stat: no need to ask funcnames nor context.
29654 stripspace: incomplete line fix (take #2)
29655 Retire git-log.sh (take #4)
29656 git-log <diff-options> <paths> documentation
29657 "git cmd -h" for shell scripts.
29660 Linus Torvalds (4):
29661 Make "--parents" logs also be incremental
29662 When showing a commit message, do not lose an incomplete line.
29663 Use less memory in "git log"
29664 Clean up trailing whitespace when pretty-printing commits
29667 xdiff/xdiffi.c: fix warnings about possibly uninitialized variables
29670 Shell utilities: Guard against expr' magic tokens.
29673 Improve the git-diff-tree -c/-cc documentation
29674 Document --patch-with-raw
29675 Separate the raw diff and patch with a newline
29678 Version v1.3.0-rc3; changes since v1.3.0-rc2:
29679 ---------------------------------------------
29682 Tweaks to make asciidoc play nice.
29684 Johannes Schindelin (3):
29685 cvsimport: use git-update-ref when updating
29686 On some platforms, certain headers need to be included before regex.h
29687 Fix compile with expat, but an old curl version
29690 Added Packing Heursitics IRC writeup.
29692 Junio C Hamano (16):
29693 git-clone: fix handling of upsteram whose HEAD does not point at master.
29694 combine-diff: use built-in xdiff.
29695 parse_date(): fix parsing 03/10/2006
29696 combine-diff: refactor built-in xdiff interface.
29697 diff_flush(): leakfix.
29698 combine-diff: move the code to parse hunk-header into common library.
29699 blame: use built-in xdiff
29700 date parsing: be friendlier to our European friends.
29701 blame.c: fix completely broken ancestry traversal.
29702 Match ofs/cnt types in diff interface.
29703 blame -S <ancestry-file>
29704 Add Documentation/technical/pack-format.txt
29705 Thin pack generation: optimization.
29706 rev-list --abbrev-commit
29707 count-delta: match get_delta_hdr_size() changes.
29710 Karl Hasselström (1):
29711 git-svnimport: Don't assume that copied files haven't changed
29714 Provide configurable UI font for gitk
29717 git-commit: document --amend
29720 gitk: Use git wrapper to run git-ls-remote.
29722 Mike McCormack (3):
29723 Avoid a divide by zero if there's no messages to send.
29724 Avoid a crash if realloc returns a different pointer.
29725 Add documentation for git-imap-send.
29727 Nick Hengeveld (1):
29728 http-fetch: add optional DAV-based pack list
29731 check patch_delta bounds more carefully
29733 Paul Mackerras (3):
29734 gitk: replace parent and children arrays with lists
29735 gitk: Add a help menu item to display key bindings
29736 gitk: Fix incorrect invocation of getmergediffline
29739 Add git-clean command
29740 gitk: Fix searching for filenames in gitk
29743 Support for pickaxe matching regular expressions
29745 Rutger Nijlunsing (1):
29746 gitk: add key bindings for selecting first and last commit
29748 Stephen Rothwell (1):
29749 gitk: allow goto heads
29752 Version v1.3.0-rc2; changes since v1.3.0-rc1:
29753 ---------------------------------------------
29755 Davide Libenzi (1):
29756 Clean-up trivially redundant diff.
29759 contrib/git-svn: force GIT_DIR to an absolute path
29760 contrib/git-svn: accept configuration via repo-config
29761 contrib/git-svn: documentation updates
29762 contrib/git-svn: ensure repo-config returns a value before using it
29763 contrib/git-svn: make sure our git-svn is up-to-date for test
29764 contrib/git-svn: handle array values correctly
29766 J. Bruce Fields (1):
29767 Documentation: revise top of git man page
29770 Add ALL_LDFLAGS to the git target.
29771 Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.
29774 fix repacking with lots of tags
29776 Junio C Hamano (14):
29777 rev-list --no-merges: argument parsing fix.
29778 rev-list: memory usage reduction.
29779 rev-list --boundary
29780 revision arguments: ..B means HEAD..B, just like A.. means A..HEAD
29781 revision.c "..B" syntax: constness fix
29782 assume unchanged git: diff-index fix.
29783 tree/diff header cleanup.
29784 rev-list --boundary: fix re-injecting boundary commits.
29785 Makefile: many programs now depend on xdiff/lib.a having been built.
29786 revision: --topo-order and --unpacked
29787 revision: simplify argument parsing.
29788 revision: --max-age alone does not need limit_list() anymore.
29789 safe_fgets() - even more anal fgets()
29792 Linus Torvalds (5):
29793 Move "--parent" parsing into generic revision.c library code
29794 Make path-limiting be incremental when possible.
29795 revision: Fix --topo-order and --max-age with reachability limiting.
29796 Fix Solaris stdio signal handling stupidities
29797 pack-objects: be incredibly anal about stdio semantics
29800 xdiff: Show function names in hunk headers.
29802 Nick Hengeveld (2):
29803 git-ls-remote: send no-cache header when fetching info/refs
29804 Set HTTP user agent to git/GIT_VERSION
29806 Paul Mackerras (5):
29807 gitk: Use the new --boundary flag to git-rev-list
29808 gitk: Show diffs for boundary commits
29809 gitk: Prevent parent link from overwriting commit headline
29810 gitk: Allow top panes to scroll horizontally with mouse button 2
29811 gitk: Better workaround for arrows on diagonal line segments
29814 Use blob_, commit_, tag_, and tree_type throughout.
29815 Replace xmalloc+memset(0) with xcalloc.
29818 Remove useless pointer update
29819 Fix sparse warnings about usage of 0 instead of NULL
29820 Fix sparse warnings about non-ANSI function prototypes
29823 Make git-clone to take long double-dashed origin option (--origin)
29824 git-clone: exit early if repo isn't specified
29827 Version v1.3.0-rc1; changes since v1.2.6:
29828 -----------------------------------------
29831 PATCH: simplify calls to git programs in git-fmt-merge-msg
29832 workaround fat/ntfs deficiencies for t3600-rm.sh (git-rm)
29834 Alexandre Julliard (12):
29835 Add an Emacs interface in contrib.
29836 git-format-patch: Always add a blank line between headers and body.
29837 contrib/emacs: Add an Emacs VC backend.
29838 git.el: Portability fixes for XEmacs and Emacs CVS.
29839 git.el: Set default directory before running the status mode setup hooks.
29840 git.el: Automatically update .gitignore status.
29841 git.el: Added support for Signed-off-by.
29842 git.el: Added customize support for all parameters.
29843 ls-files: Don't require exclude files to end with a newline.
29844 git.el: More robust handling of subprocess errors when returning strings.
29845 git.el: Get the default user name and email from the repository config.
29846 git.el: Added a function to diff against the other heads in a merge.
29849 git-svnimport: if a limit is specified, respect it
29851 Aneesh Kumar K.V (16):
29852 Add contrib/gitview from Aneesh.
29853 Add a README for gitview
29855 gitview: Read tag and branch information using git ls-remote
29856 gitview: Use monospace font to draw the branch and tag name
29857 gitview: Display the lines joining commit nodes clearly.
29858 gitview: Fix DeprecationWarning
29859 gitview: Bump the rev
29860 gitview: Code cleanup
29861 gitview: Fix the graph display .
29862 gitview: Fix the encoding related bug
29863 gitview: Remove trailing white space
29864 gitview: Some window layout changes.
29865 gitview: Set the default width of graph cell
29866 gitview: Use horizontal scroll bar in the tree view
29867 gitview: pass the missing argument _show_clicked_cb.
29870 git-rebase: Clarify usage statement and copy it into the actual documentation.
29871 New test to verify that when git-clone fails it cleans up the new directory.
29872 git-ls-files: Fix, document, and add test for --error-unmatch option.
29873 Add new git-rm command with documentation
29874 git-rm: Fix to properly handle files with spaces, tabs, newlines, etc.
29876 Dmitry V. Levin (1):
29877 git/Documentation: fix SYNOPSIS style bugs
29880 Introducing contrib/git-svn.
29881 git-svn: fix revision order when XML::Simple is not loaded
29882 git-svn: ensure fetch always works chronologically.
29883 git-svn: remove files from the index before adding/updating
29884 git-svn: fix a typo in defining the --no-stop-on-copy option
29885 git-svn: allow --find-copies-harder and -l<num> to be passed on commit
29886 git-svn: Allow for more argument types for commit (from..to)
29887 git-svn: remove any need for the XML::Simple dependency
29888 git-svn: change ; to && in addremove()
29889 contrib/git-svn.txt: add a note about renamed/copied directory support
29890 git-svn: fix several corner-case and rare bugs with 'commit'
29891 contrib/git-svn: add Makefile, test, and associated ignores
29892 git-svn: 0.9.1: add --version and copyright/license (GPL v2+) information
29893 contrib/git-svn: add show-ignore command
29894 contrib/git-svn: optimize sequential commits to svn
29895 contrib/git-svn: version 0.10.0
29896 contrib/git-svn: tell the user to not modify git-svn-HEAD directly
29897 contrib/git-svn: correct commit example in manpage
29898 contrib/git-svn: use refs/remotes/git-svn instead of git-svn-HEAD
29899 git-branch: add -r switch to list refs/remotes/*
29900 contrib/git-svn: add -b/--branch switch for branch detection
29901 contrib/git-svn: several small bug fixes and changes
29902 contrib/git-svn: strip 'git-svn-id:' when commiting to SVN
29903 contrib/git-svn: allow --authors-file to be specified
29904 contrib/git-svn: cleanup option parsing
29905 contrib/git-svn: create a more recent master if one does not exist
29906 contrib/git-svn: avoid re-reading the repository uuid, it never changes
29907 contrib/git-svn: add --id/-i=$GIT_SVN_ID command-line switch
29908 contrib/git-svn: better documenting of CLI switches
29909 send-email: accept --no-signed-off-by-cc as the documentation states
29910 contrib/git-svn: fix a copied-tree bug in an overzealous assertion
29911 contrib/git-svn: fix svn compat and fetch args
29912 contrib/git-svn: remove the --no-stop-on-copy flag
29913 contrib/git-svn: fix a harmless warning on rebuild (with old repos)
29914 fetch,parse-remote,fmt-merge-msg: refs/remotes/* support
29915 ls-tree: add --abbrev[=<n>] option
29916 ls-files: add --abbrev[=<n>] option
29917 contrib/git-svn: allow rebuild to work on non-linear remote heads
29918 send-email: use built-in time() instead of /bin/date '+%s'
29919 send-email: Change from Mail::Sendmail to Net::SMTP
29920 send-email: try to order messages in email clients more correctly
29921 send-email: lazy-load Email::Valid and make it optional
29922 contrib/git-svn: stabilize memory usage for big fetches
29924 Fernando J. Pereda (1):
29925 Allow building Git in systems without iconv
29928 AsciiDoc fix for tutorial
29929 Tweak asciidoc output to work with broken docbook-xsl
29930 Fix multi-paragraph list items in OPTIONS section
29931 Format tweaks for asciidoc.
29933 Fredrik Kuivinen (13):
29934 Add git-blame, a tool for assigning blame.
29936 git-blame: Make the output human readable
29937 git-blame: Use the same tests for git-blame as for git-annotate
29938 Fix some inconsistencies in the docs
29939 Remove trailing dot after short description
29940 Nicer output from 'git'
29941 Make it possible to not clobber object.util in sort_in_topological_order (take 2)
29942 rev-lib: Make it easy to do rename tracking (take 2)
29943 blame: Rename detection (take 2)
29944 blame: Nicer output
29945 blame: Fix git-blame <directory>
29946 Makefile: Add TAGS and tags targets
29948 J. Bruce Fields (1):
29949 Document git-rebase behavior on conflicts.
29952 Fix typo in git-rebase.sh.
29954 Jeff Muizelaar (2):
29955 cosmetics: change from 'See-Also' to 'See Also'
29956 documentation: add 'see also' sections to git-rm and git-add
29958 Johannes Schindelin (13):
29960 Optionally support old diffs
29962 Optionally work without python
29963 Fixes for ancient versions of GNU make
29964 avoid makefile override warning
29965 Really honour NO_PYTHON
29967 Use Ryan's git-annotate instead of jsannotate
29968 Warn about invalid refs
29969 Fix test case for some sed
29970 imap-send: Add missing #include for macosx
29971 Remove dependency on a file named "-lz"
29974 Add git-show reference
29975 Call out the two different uses of git-branch and fix a typo.
29976 Document the default source of template files.
29977 Clarify git-rebase example commands.
29978 Reference git-commit-tree for env vars.
29980 Rewrite synopsis to clarify the two primary uses of git-checkout.
29981 Clarify and expand some hook documentation.
29982 Removed bogus "<snap>" identifier.
29985 manpages: insert two missing [verse] markers for multi-line SYNOPSIS
29986 repo-config: give value_ a sane default so regexec won't segfault
29988 Josef Weidendorfer (1):
29989 git-mv: fix moves into a subdir from outside
29991 Junio C Hamano (137):
29992 "Assume unchanged" git
29993 "Assume unchanged" git: do not set CE_VALID with --refresh
29994 ls-files: debugging aid for CE_VALID changes.
29995 "Assume unchanged" git: --really-refresh fix.
29996 ls-files: split "show-valid-bit" into a different option.
29997 "assume unchanged" git: documentation.
29998 cache_name_compare() compares name and stage, nothing else.
29999 git-commit: Now --only semantics is the default.
30000 rebase: allow a hook to refuse rebasing.
30001 commit: detect misspelled pathspec while making a partial commit.
30002 rebase: allow rebasing onto different base.
30003 ls-files --error-unmatch pathspec error reporting fix.
30004 Detect misspelled pathspec to git-add
30005 packed objects: minor cleanup
30006 topo-order: make --date-order optional.
30007 pack-objects: reuse data from existing packs.
30008 pack-objects: finishing touches.
30009 git-repack: allow passing a couple of flags to pack-objects.
30010 git-tag: -l to list tags (usability).
30011 Add contrib/README.
30012 SubmittingPatches: note on whitespaces
30013 pack-objects: avoid delta chains that are too long.
30014 Make "empty ident" error message a bit more helpful.
30015 Delay "empty ident" errors until they really matter.
30016 Keep Porcelainish from failing by broken ident after making changes.
30017 fmt-merge-msg: say which branch things were merged into unless 'master'
30018 Allow git-mv to accept ./ in paths.
30019 Documentation: fix typo in rev-parse --short option description.
30020 fmt-merge-msg: do not add excess newline at the end.
30021 rev-list --objects-edge
30022 Thin pack - create packfile with missing delta base.
30023 send-pack --thin: use "thin pack" delta transfer.
30024 Add git-push --thin.
30025 Use thin pack transfer in "git fetch".
30026 fmt-merge-msg: avoid open "-|" list form for Perl 5.6
30027 rerere: avoid open "-|" list form for Perl 5.6
30028 send-email: avoid open "-|" list form for Perl 5.6
30029 svnimport: avoid open "-|" list form for Perl 5.6
30030 cvsimport: avoid open "-|" list form for Perl 5.6
30031 Fix fmt-merge-msg counting.
30032 cherry-pick/revert: error-help message rewording.
30033 git-mktree: reverse of git-ls-tree.
30034 rev-list.c: fix non-grammatical comments.
30035 send-pack: do not give up when remote has insanely large number of refs.
30036 gitview: ls-remote invocation shellquote safety.
30037 pack-objects: thin pack micro-optimization.
30038 pack-objects: use full pathname to help hashing with "thin" pack.
30039 count-delta: tweak counting of copied source material.
30040 count-delta: fix counting of copied source.
30041 Tweak break/merge score to adjust to the new delta generation code.
30042 pack-objects: allow "thin" packs to exceed depth limits
30043 rev-list --objects-edge: remove duplicated edge commit output.
30044 rev-list --objects: use full pathname to help hashing.
30045 pack-objects: hash basename and direname a bit differently.
30046 Revert "diff-delta: produce optimal pack data"
30047 Build and install git-mailinfo.
30048 rev-list split: minimum fixup.
30049 apply --whitespace fixes and enhancements.
30050 apply: squelch excessive errors and --whitespace=error-all
30051 apply --whitespace: configuration option.
30052 git-apply --whitespace=nowarn
30053 Revert "Revert "diff-delta: produce optimal pack data""
30054 git-apply: war on whitespace -- finishing touches.
30055 diffcore-break: micro-optimize by avoiding delta between identical files.
30056 diffcore-rename: split out the delta counting code.
30057 diffcore-delta: stop using deltifier for packing.
30058 git-am: --whitespace=x option.
30059 diff-delta: cull collided hash bucket more aggressively.
30060 git-log (internal): add approxidate.
30061 git-log (internal): more options.
30062 Pretty-print tagger dates.
30063 war on whitespaces: documentation.
30064 Documentation: read-tree --aggressive
30065 Documentation: rev-list --objects-edge
30066 annotate: resurrect raw timestamps.
30067 setup_revisions(): handle -n<n> and -<n> internally.
30068 GIT-VERSION-GEN: squelch unneeded error from "cat version"
30069 show-branch --topics
30071 git-commit: make sure we protect against races.
30072 diffcore-rename: similarity estimator fix.
30073 show-branch --topics: omit more uninteresting commits.
30074 count-delta: no need for this anymore.
30075 diffcore-break: similarity estimator fix.
30076 diffcore-delta: make change counter to byte oriented again.
30077 git-commit --amend: allow empty commit.
30079 verify-pack -v: show delta-chain histogram.
30080 blame: avoid -lm by not using log().
30081 blame and annotate: show localtime with timezone.
30082 blame: avoid "diff -u0".
30083 annotate/blame tests updates.
30084 annotate-blame test: don't "source", but say "."
30085 annotate-blame test: add evil merge.
30086 blame: unbreak "diff -U 0".
30087 annotate-blame: tests incomplete lines.
30088 pack-objects: simplify "thin" pack.
30089 Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
30090 refs.c::do_for_each_ref(): Finish error message lines with "\n"
30091 fsck-objects: Remove --standalone
30092 Fix t1200 test for breakage caused by removal of full-stop at the end of fast-forward message.
30093 try_to_simplify_commit(): do not skip inspecting tree change at boundary.
30094 repack: prune loose objects when -d is given
30095 git-diff: -p disables rename detection.
30096 diffcore-rename: somewhat optimized.
30097 revision traversal: --remove-empty fix.
30098 revision traversal: --remove-empty fix (take #2).
30099 diffcore-delta: make the hash a bit denser.
30100 diffcore-delta: tweak hashbase value.
30101 cvsimport: honor -i and non -i upon subsequent imports
30102 fetch: exit non-zero when fast-forward check fails.
30103 cvsimport: fix reading from rev-parse
30104 git-pull: run repo-config with dash form.
30105 unpack_delta_entry(): reduce memory footprint.
30106 generate-cmdlist: style cleanups.
30108 git-merge knows some strategies want to skip trivial merges
30109 http-fetch: nicer warning for a server with unreliable 404 status
30110 core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists.
30111 revamp git-clone (take #2).
30112 get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD
30113 clone: record the remote primary branch with remotes/$origin/HEAD
30114 http-push.c: squelch C90 warnings.
30115 git-apply: do not barf when updating an originally empty file.
30116 rev-list --timestamp
30117 git-clone: typofix.
30118 git-pull: further safety while on tracking branch.
30119 git-pull: reword "impossible to fast-forward" message.
30120 sha1_name: warning ambiguous refs.
30121 sha1_name: make core.warnambiguousrefs the default.
30122 send-email: Identify author at the top when sending e-mail
30123 commit-tree: check return value from write_sha1_file()
30124 built-in diff: minimum tweaks
30125 true built-in diff: run everything in-core.
30126 git-push: make --thin pack transfer the default.
30127 add clean and ignore rules for xdiff/
30130 Karl Hasselström (7):
30131 git-svnimport: -r adds svn revision number to commit messages
30132 svnimport: Mention -r in usage summary
30133 svnimport: Convert executable flag
30134 svnimport: Convert the svn:ignore property
30135 svnimport: Read author names and emails from a file
30136 Let git-svnimport's author file use same syntax as git-cvsimport's
30137 Save username -> Full Name <email@addr.es> map file
30139 Linus Torvalds (21):
30140 Handling large files with GIT
30141 Handling large files with GIT
30142 git-merge-tree: generalize the "traverse <n> trees in sync" functionality
30143 Teach the "git" command to handle some commands internally
30144 First cut at libifying revlist generation
30145 Make git diff-generation use a simpler spawn-like interface
30146 The war on trailing whitespace
30147 Splitting rev-list into revisions lib, end of beginning.
30148 git-rev-list libification: rev-list walking
30149 Introduce trivial new pager.c helper infrastructure
30150 Tie it all together: "git log"
30151 Rip out merge-order and make "git log <paths>..." work again.
30152 get_revision(): do not dig deeper when we know we are at the end.
30153 git-fmt-merge-msg cleanup
30154 Fix up diffcore-rename scoring
30155 diffcore-delta: 64-byte-or-EOL ultrafast replacement.
30156 diffcore-delta: 64-byte-or-EOL ultrafast replacement (hash fix).
30157 git-apply: safety fixes
30158 Use a *real* built-in diff generator
30159 builtin-diff: \No newline at end of file.
30160 Fix error handling for nonexistent names
30162 Lukas Sandström (1):
30163 git-fetch: print the new and old ref when fast-forwarding
30165 Marco Costalba (1):
30166 Add a Documentation/git-tools.txt
30169 imap-send: cleanup execl() call to use NULL sentinel instead of 0
30172 Let merge set the default strategy.
30175 combine-diff: Honour --full-index.
30176 combine-diff: Honour -z option correctly.
30177 Documentation/Makefile: Some `git-*.txt' files aren't manpages.
30178 gitignore: Ignore some more boring things.
30179 contrib/emacs/Makefile: Provide tool for byte-compiling files.
30180 annotate-tests: override VISUAL when running tests.
30182 Martin Langhoff (18):
30183 Introducing git-cvsserver -- a CVS emulator for git.
30184 cvsserver: add notes on how to get a checkout under Eclipse
30185 cvsserver: Eclipse compat fixes - implement Questionable, alias rlog, add a space after the U
30186 cvsserver: Eclipse compat - browsing 'modules' (heads in our case) works
30187 cvsserver: add notes on how to get a checkout under Eclipse
30188 cvsserver: Eclipse compat fixes - implement Questionable, alias rlog, add a space after the U
30189 cvsserver: Eclipse compat - browsing 'modules' (heads in our case) works
30190 cvsserver: Checkout correctly on Eclipse
30191 annotate: fix -S parameter to take a string
30192 cvsserver: Eclipse compat -- now "compare with latest from HEAD" works
30193 cvsserver: checkout faster by sending files in a sensible order
30194 cvsserver: fix checkouts with -d <somedir>
30195 cvsserver: checkout faster by sending files in a sensible order
30196 cvsserver: fix checkouts with -d <somedir>
30197 cvsserver: nested directory creation fixups for Eclipse clients
30198 cvsserver: better error messages
30199 cvsserver: anonymous cvs via pserver support
30200 cvsserver: updated documentation
30203 gitk: Make error_popup react to Return
30205 Matthias Urlichs (2):
30206 cvsimport: Remove master-updating code
30207 Don't recurse into parents marked uninteresting.
30209 Mike McCormack (5):
30210 Allow adding arbitary lines in the mail header generated by format-patch.
30211 Allow format-patch to attach patches
30212 Document the --attach flag.
30213 Describe how to add extra mail header lines in mail generated by git-format-patch.
30214 Add git-imap-send, derived from isync 1.0.1.
30216 Nick Hengeveld (10):
30217 Update http-push functionality
30218 http-push: fix revision walk
30219 HTTP slot reuse fixes
30220 http-push: refactor remote file/directory processing
30221 http-push: improve remote lock management
30222 http-push: support for updating remote info/refs
30224 Fix broken slot reuse when fetching alternates
30225 http-push: add support for deleting remote branches
30226 http-push: don't assume char is signed
30228 Nicolas Pitre (11):
30229 relax delta selection filtering in pack-objects
30230 diff-delta: fold two special tests into one plus cleanups
30231 diff-delta: produce optimal pack data
30232 diff-delta: big code simplification
30233 diff-delta: bound hash list length to avoid O(m*n) behavior
30234 diff-delta: produce optimal pack data
30235 diff-delta: bound hash list length to avoid O(m*n) behavior
30236 diff-delta: allow reusing of the reference buffer index
30237 test-delta needs zlib to compile
30238 diff-delta: bound hash list length to avoid O(m*n) behavior
30239 3% tighter packs for free
30242 allow double click on current HEAD id after git-pull
30245 Makefile tweaks: Solaris 9+ dont need iconv / move up uname variables
30247 Paul Mackerras (13):
30248 gitk: Make "find" on "Files" work again.
30249 gitk: New improved gitk
30250 gitk: Fix clicks on arrows on line ends
30251 gitk: Fix Update menu item
30252 gitk: Various speed improvements
30253 gitk: Further speedups
30254 gitk: Fix a bug in drawing the selected line as a thick line
30255 gitk: Fix display of diff lines beginning with --- or +++
30256 gitk: Make commitdata an array rather than a list
30257 gitk: Don't change cursor at end of layout if find in progress
30258 gitk: Make downward-pointing arrows end in vertical line segment
30259 gitk: Improve appearance of first child links
30260 gitk: Fix two bugs reported by users
30263 gitview: Select the text color based on whether the entry in highlighted. Use standard font.
30266 Properly git-bisect reset after bisecting from non-master head
30267 Optionally do not list empty directories in git-ls-files --others
30269 Randal L. Schwartz (1):
30270 fix imap-send for OSX
30273 tar-tree: Use SHA1 of root tree for the basedir
30274 tar-tree: Introduce write_entry()
30275 tar-tree: Use write_entry() to write the archive contents
30276 tar-tree: Remove obsolete code
30277 tar-tree: Use the prefix field of a tar header
30280 send-email: Add some options for controlling how addresses are automatically added to the cc: list.
30281 send-email: Add --cc
30282 Add git-annotate, a tool for assigning blame.
30283 annotate: Handle dirty state and arbitrary revisions.
30284 annotate: Convert all -| calls to use a helper open_pipe().
30285 annotate: Use qx{} for pipes on activestate.
30286 annotate: handle \No newline at end of file.
30287 annotate: Add a basic set of test cases.
30288 annotate: Support annotation of files on other revisions.
30290 Sean Estabrooks (1):
30291 annotate.perl triggers rpm bug
30293 Shawn O. Pearce (7):
30294 git ls files recursively show ignored files
30295 Add missing programs to ignore list
30296 Darwin: Ignore missing /sw/lib
30297 Teach git-checkout-index to read filenames from stdin.
30298 Prevent --index-info from ignoring -z.
30299 Add --temp and --stage=all options to checkout-index.
30300 Add missing semicolon to sed command.
30303 Use setenv(), fix warnings
30306 fix warning from pack-objects.c
30307 Re-fix compilation warnings.
30308 annotate should number lines starting with 1
30309 fix field width/precision warnings in blame.c
30312 Be verbose when !initial commit
30315 Version v1.2.6; changes since v1.2.5:
30316 -------------------------------------
30318 Junio C Hamano (3):
30319 parse_date(): fix parsing 03/10/2006
30320 diff_flush(): leakfix.
30321 count-delta: match get_delta_hdr_size() changes.
30324 check patch_delta bounds more carefully
30327 Version v1.2.5; changes since v1.2.4:
30328 -------------------------------------
30331 Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.
30333 Junio C Hamano (3):
30334 read-tree --aggressive: remove deleted entry from the working tree.
30335 tar-tree: file/dirmode fix.
30336 safe_fgets() - even more anal fgets()
30338 Linus Torvalds (2):
30339 Fix Solaris stdio signal handling stupidities
30340 pack-objects: be incredibly anal about stdio semantics
30343 Version v1.2.4; changes since v1.2.3:
30344 -------------------------------------
30347 fix t5600-clone-fail-cleanup.sh on windows
30349 Josef Weidendorfer (2):
30350 git-mv: Allow -h without repo & fix error message
30351 git-mv: fixes for path handling
30353 Junio C Hamano (13):
30354 checkout - eye candy.
30355 Give no terminating LF to error() function.
30356 diffcore-rename: plug memory leak.
30357 git-am: do not allow empty commits by mistake.
30358 sample hooks template.
30359 apply --whitespace fixes and enhancements.
30360 apply: squelch excessive errors and --whitespace=error-all
30361 apply --whitespace: configuration option.
30362 git-apply --whitespace=nowarn
30363 git-apply: war on whitespace -- finishing touches.
30364 git-am: --whitespace=x option.
30365 diffcore-break: micro-optimize by avoiding delta between identical files.
30366 Allow git-mv to accept ./ in paths.
30368 Linus Torvalds (1):
30369 The war on trailing whitespace
30372 combine-diff: Honour --full-index.
30373 combine-diff: Honour -z option correctly.
30376 Version v1.2.3; changes since v1.2.2:
30377 -------------------------------------
30380 git-add: Add support for --, documentation, and test.
30381 git-push: Update documentation to describe the no-refspec behavior.
30383 Junio C Hamano (11):
30384 format-patch: pretty-print timestamp correctly.
30385 detect broken alternates.
30386 pack-objects: reuse data from existing packs.
30387 pack-objects: finishing touches.
30388 git-repack: allow passing a couple of flags to pack-objects.
30389 pack-objects: avoid delta chains that are too long.
30390 Make "empty ident" error message a bit more helpful.
30391 Delay "empty ident" errors until they really matter.
30392 Keep Porcelainish from failing by broken ident after making changes.
30393 pack-objects eye-candy: finishing touches.
30394 git-fetch: follow tag only when tracking remote branch.
30397 nicer eye candies for pack-objects
30398 also adds progress when actually writing a pack
30401 Version v1.2.2; changes since v1.2.1:
30402 -------------------------------------
30405 Trap exit to clean up created directory if clone fails.
30406 Abstract test_create_repo out for use in tests.
30407 Prevent git-upload-pack segfault if object cannot be found
30410 archimport: remove files from the index before adding/updating
30413 git-rev-parse: Fix --short= option parsing
30414 Document --short and --git-dir in git-rev-parse(1)
30417 Fix retries in git-cvsimport
30419 Shawn O. Pearce (1):
30420 Make git-reset delete empty directories
30423 Version v1.2.1; changes since v1.2.0:
30424 -------------------------------------
30426 Fernando J. Pereda (1):
30427 Print an error if cloning a http repo and NO_CURL is set
30429 Fredrik Kuivinen (1):
30430 s/SHELL/SHELL_PATH/ in Makefile
30432 Josef Weidendorfer (1):
30433 More useful/hinting error messages in git-checkout
30435 Junio C Hamano (6):
30436 Documentation: git-commit in 1.2.X series defaults to --include.
30437 Documentation: git-ls-files asciidocco.
30438 bisect: remove BISECT_NAMES after done.
30439 combine-diff: diff-files fix.
30440 combine-diff: diff-files fix (#2)
30441 checkout: fix dirty-file display.
30444 Version v1.2.0; changes since v1.1.6:
30445 -------------------------------------
30448 Add freebsd support in Makefile
30451 fix "test: 2: unexpected operator" on bsd
30452 avoid echo -e, there are systems where it does not work
30454 Andreas Ericsson (4):
30455 git-cvsimport: Add -A <author-conv-file> option
30456 update-hook: Major overhaul (handling tags, mainly).
30457 format-patch: Remove last vestiges of --mbox option
30458 .gitignore git-rerere and config.mak
30460 Christian Biesinger (1):
30461 Use a relative path for SVN importing
30463 Daniel Barkalow (4):
30464 Only use a single parser for tree objects
30465 Use struct tree in tar-tree
30466 Use struct commit in tar-tree
30467 Make apply accept the -pNUM option like patch does.
30469 Eric W. Biederman (1):
30470 Fix git-format-patch -s to include a Signed-off-by: line...
30473 rev-list: allow -n<n> as shorthand for --max-count=<n>
30474 rev-list: allow -<n> as shorthand for --max-count=<n>
30476 Florian Weimer (1):
30477 AsciiDoc fixes for the git-svnimport manpage
30479 Fredrik Kuivinen (2):
30480 merge-recursive: Make use of provided bases
30481 merge-recursive: Speed up commit graph construction
30483 J. Bruce Fields (7):
30484 Minor git-reset and git-commit documentation fixes
30485 Mention install-doc in INSTALL
30487 cvs-migration documentation update
30488 Docs: split up pull-fetch-param.txt
30489 Docs: move git url and remotes text to separate sections
30490 Docs: minor git-push copyediting
30493 Run GIT-VERSION-GEN with $(SHELL), not sh.
30494 Add compat/unsetenv.c .
30495 Use sha1_file.c's mkdir-like routine in apply.c.
30496 stat() for existence in safe_create_leading_directories()
30498 Johannes Schindelin (1):
30499 Use a hashtable for objects instead of a sorted list
30502 Add --diff-filter= documentation paragraph
30504 Junio C Hamano (112):
30505 show-branch: take default arguments from configuration file.
30506 git-describe: default to HEAD
30507 Makefile: add 'strip' target
30508 octopus: allow criss-cross and clarify the message when it rejects
30509 Fix the installation location.
30510 checkout: automerge local changes while switching branches.
30511 checkout: merge local modifications while switching branches.
30512 git-push: avoid falling back on pushing "matching" refs.
30513 checkout: show dirty state upon switching branches.
30514 clone: --naked option.
30515 format-patch: always --mbox and show sane Date:
30516 octopus: allow manual resolve on the last round.
30517 Documentation: show-branch.
30518 show-branch: make the current branch and merge commits stand out.
30519 show-branch: --current includes the current branch.
30520 cvsimport: ease migration from CVSROOT/users format
30521 git-push: fix --tags and document it.
30522 Allow building of RPM from interim snapshot.
30523 Revert "git-push: avoid falling back on pushing "matching" refs."
30524 Makefile: do not assume lack of IPV6 means no sockaddr_storage.
30525 fsck-objects: support platforms without d_ino in struct dirent.
30526 DT_UNKNOWN: do not fully trust existence of DT_UNKNOWN
30527 t4011: "sleep 1" is not enough on FAT
30528 Undef DT_* before redefining them.
30529 git-grep: clarification on parameters.
30530 Recommend to remove unused `origin` in a shared repository.
30531 Documentation: finishing touches to the new tutorial.
30532 sample update-hook: sanely handle a new branch head.
30533 git-clone: PG13 --naked option to --bare.
30534 clone: do not create remotes/origin nor origin branch in a bare repository.
30535 clone: do not accept more than one -o option.
30536 tests: adjust breakage by stricter rev-parse
30537 git-fetch --upload-pack: disambiguate.
30538 merge: seed the commit message with list of conflicted files.
30539 diff-tree -c: show a merge commit a bit more sensibly.
30540 diff-tree --cc: denser combined diff output for a merge commit.
30541 combine-diff: fix appending at the tail of a list.
30542 combine-diff: minor output changes.
30543 combine-diff: extend --cc logic to Octopus.
30544 diff-tree --cc: squelch header generation on empty patch.
30545 combine-diff: better hunk splitting.
30546 diff-files: -c and --cc options.
30547 rev-list --remove-empty: add minimum help and doc entry.
30548 abbrev cleanup: use symbolic constants
30549 rev-parse: --abbrev option.
30550 diff-tree: abbreviate merge parent object names with --abbrev --pretty.
30551 rev-parse --abbrev: do not try abbrev shorter than minimum.
30552 Rename rev-parse --abbrev to --short.
30553 pretty_print_commit(): pass commit object instead of commit->buffer.
30554 pretty_print_commit: honor grafts.
30555 diff --abbrev=<n> option fix.
30556 rev-parse: make "whatchanged -- git-fetch-script" work again.
30557 diff-files -c/--cc: combine only when both ours and theirs exist.
30558 Documentation: diff -c/--cc
30559 documentation: cvs migration - typofix.
30560 update-index --index-info: allow stage 0 entries.
30561 rev-list: omit duplicated parents.
30562 combine-diff: reuse diff from the same blob.
30563 combine-diff: update --cc "uninteresting hunks" logic.
30564 combine-diff: add safety check to --cc.
30565 combine-diff: fix placement of deletion.
30566 Documentation: git-diff-tree --cc also omits empty commits
30567 commit.c: "Merge" fix in pretty_print_commit.
30568 combine-diff: add a bit more comments.
30569 combine-diff: show parent line numbers as well.
30570 combine-diff: cleanup.
30571 combine-diff: finishing touches to git-diff-tree --cc
30572 whitespace cleanup.
30573 get_sha1_1: allow octopus^12 to be properly parsed.
30574 git-merge: Properly quote $merge_msg variable.
30575 Do not fall back on vi on dumb terminals.
30576 diff-index: make --cc a synonym for -p for now.
30577 git-diff: use --cc instead of -p.
30579 daemon: do not forbid user relative paths unconditionally under --base-path
30580 daemon: extend user-relative path notation.
30581 combine-diff: remove misguided --show-empty hack.
30582 git-diff-tree --stdin: show all parents.
30583 git-diff: do not fall back on --cc when -[123], --ours etc. are given.
30584 core-tutorial: adjust to recent reality.
30585 combine-diff: do not send NULL to printf
30586 combine-diff: show mode changes as well.
30587 combine-diff: do not punt on removed or added files.
30588 mailinfo: reset CTE after each multipart
30589 read-tree --aggressive
30590 fmt-merge-msg: show summary of what is merged.
30591 git-rerere: reuse recorded resolve.
30592 git-commit: revamp the git-commit semantics.
30593 git-commit: finishing touches.
30594 Do not allow empty name or email.
30595 t6000: fix a careless test library add-on.
30596 ls-files: honour per-directory ignore file from higher directories.
30597 combined-diff: use diffcore before intersecting paths.
30598 call git_config() after setup_git_directory()
30599 combine-diff: move formatting logic to show_combined_diff()
30600 count-delta.c: Match the delta data semantics change in version 3.
30602 find_unique_abbrev() simplification.
30603 combine-diff: Record diff status a bit more faithfully
30604 rev-list: default to abbreviate merge parent names under --pretty.
30605 git-commit -v: have patch at the end.
30606 Define GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL) to known values.
30607 fetch-clone progress: finishing touches.
30608 Only call git-rerere if $GIT_DIR/rr-cache exists.
30609 t5500: adjust to change in pack-object reporting behaviour.
30610 diff-tree: do not default to -c
30611 Avoid using "git-var -l" until it gets fixed.
30612 hashtable-based objects: minimum fixups.
30613 Make pack-objects chattier.
30614 git-commit: show dirtiness including index.
30615 Fix "test: unexpected operator" on bsd
30619 Add howto about separating topics.
30621 Linus Torvalds (14):
30622 Make git-rev-list and git-rev-parse argument parsing stricter
30623 git-whatchanged: exit out early on errors
30624 rev-list: stop when the file disappears
30625 Make the "struct tree_desc" operations available to others
30626 Make git-tar-tree use the tree_desc abstractions
30627 Fix git-rev-parse over-eager errors
30628 diff-tree --always flag
30629 rev-parse lstat() workaround cleanup.
30630 Fix "git diff a..b" breakage
30631 diff-tree -c raw output
30632 Make "git clone" less of a deathly quiet experience
30633 Make "git clone" pack-fetching download statistics better
30634 Fix fetch-clone in the presense of signals
30635 Fix object re-hashing
30638 daemon: Provide missing argument for logerror() call.
30639 http-fetch: Fix object list corruption in fill_active_slots().
30640 http-fetch: Fix message reporting rename of object file.
30641 http: Turn on verbose Curl messages if GIT_CURL_VERBOSE set in environment
30642 http-fetch: Tidy control flow in process_alternate_response
30643 daemon: Set SO_REUSEADDR on listening sockets.
30644 http-fetch: Abort requests for objects which arrived in packs
30646 Martin Langhoff (3):
30647 cvsimport: Add -S <skipfileregex> support and -v announces files retrieved
30648 exportcommit: replace backticks with safe_pipe_capture() or system() - initial pass
30649 cvsexportcommit: add some examples to the documentation
30652 local push/pull env cleanup
30654 Michal Ostrowski (3):
30655 Exec git programs without using PATH.
30656 git-fetch: pass --upload-pack to fetch-pack
30657 git-{fetch,peek-remote} handling of --upload-pack
30659 Nick Hengeveld (2):
30660 Fix HTTP request result processing after slot reuse
30661 Use local structs for HTTP slot callback data
30664 remove delta-against-self bit
30665 count-delta.c: comment fixes
30666 delta micro optimization
30668 Paul Mackerras (2):
30669 gitk: Add braces around if expressions
30670 gitk: Use git-diff-tree --cc for showing the diffs for merges
30673 Disable USE_SYMLINK_HEAD by default
30674 Don't include ../README in git.txt - make a local copy
30677 Use adler32() from zlib instead of defining our own.
30680 Document git-ls-files --directory
30681 Allow diff and index commands to be interrupted
30682 Document git-diff-tree --always
30683 Basic documentation for git-show
30684 Add support for explicit type specifiers when calling git-repo-config
30687 Provide a more meaningful initial "From " line when using --compose in git-send-email.
30688 git-send-email: Add --quiet to reduce some of the chatter when sending emails.
30689 git-send-email: Fully implement --quiet and document it.
30691 Sasha Khapyorsky (1):
30692 git-svnimport.perl: fix for 'arg list too long...'
30695 Add --keep option to keep downloaded packs to git-fetch.
30698 update using-topic-branches
30700 Uwe Kleine-König (4):
30701 Fix generation of "humanish" part of source repo
30702 Remove unneeded header
30703 Use symbolic name SHORT_NAME_AMBIGUOUS as error return value
30704 Make GIT-VERSION-GEN tolerate missing git describe command again
30707 Version v1.1.6; changes since v1.1.5:
30708 -------------------------------------
30710 Fredrik Kuivinen (2):
30711 merge-recursive: Improve the error message printed when merge(1) isn't found.
30712 git-branch: Documentation fixes
30714 J. Bruce Fields (1):
30715 git push -f documentation
30717 Junio C Hamano (1):
30718 pre-commit sample hook: do not barf on the initial import
30721 Version v1.1.5; changes since v1.1.4:
30722 -------------------------------------
30724 Junio C Hamano (1):
30725 checkout: do not make a temporary copy of symlink target.
30728 Version v1.1.4; changes since v1.1.3:
30729 -------------------------------------
30731 Johannes Schindelin (1):
30732 git-fetch-pack: really do not ask for funny refs
30734 Junio C Hamano (1):
30735 Revert "check_packed_git_idx(): check integrity of the idx file itself."
30738 Version v1.1.3; changes since v1.1.2:
30739 -------------------------------------
30741 Junio C Hamano (2):
30742 diffcore-break/diffcore-rename: integer overflow.
30743 describe: omit clearing marks on the last one.
30746 Version v1.1.2; changes since v1.1.1:
30747 -------------------------------------
30749 J. Bruce Fields (1):
30750 Documentation: clarify fetch parameter descriptions.
30752 Junio C Hamano (6):
30753 update-index: work with c-quoted name
30754 describe: do not silently ignore indescribable commits
30755 name-rev: do not omit leading components of ref name.
30756 show-branch: handle [] globs as well.
30757 Documentation: git-commit -a
30758 Documentation: git-reset - interrupted workflow.
30761 Add git-describe to .gitignore.
30764 Version v1.1.1; changes since v1.1.0:
30765 -------------------------------------
30767 H. Peter Anvin (1):
30768 For release tarballs, include the proper version
30770 Johannes Schindelin (1):
30771 glossary: explain "master" and "origin"
30773 Junio C Hamano (1):
30774 GIT-VERSION-GEN: detect dirty tree and mark the version accordingly.
30777 Version v1.1.0; changes since v1.0.13:
30778 --------------------------------------
30780 Johannes Schindelin (3):
30781 git-clone: Support changing the origin branch with -o
30782 Introduce core.sharedrepository
30783 git-init-db: initialize shared repositories with --shared
30786 Make GIT-VERSION-GEN tolerate missing git describe command
30788 Junio C Hamano (23):
30789 Post 1.0.0 development track.
30790 Versioning scheme changes.
30791 merge-recursive: conflicting rename case.
30792 whatchanged: customize diff-tree output
30793 rev-parse: --show-cdup
30794 check_packed_git_idx(): check integrity of the idx file itself.
30795 checkout: sometimes work from a subdirectory.
30796 ls-tree: chomp leading directories when run from a subdirectory
30797 git-clone: do not special case dumb http.
30798 Tutorial: mention shared repository management.
30799 git-describe: really prefer tags only.
30800 git-describe: use find_unique_abbrev()
30801 git-describe: --tags and --abbrev
30802 git-describe: still prefer annotated tag under --all and --tags
30803 git-describe: documentation.
30804 Makefile: use git-describe to mark the git version.
30805 send-pack/receive-pack: allow errors to be reported back to pusher.
30806 git-fetch: auto-following tags.
30807 ls-files --others --directory: fix a bug with index entry ordering
30808 ls-files --others --directory: give trailing slash
30809 git-status: use ls-files --others --directory for untracked list.
30810 ls-files --others --directory: test
30811 describe: allow more than one revs to be named.
30813 Linus Torvalds (2):
30814 Add a "git-describe" command
30815 ls-files -o: optionally skip showing the contents in "untracked" directories
30817 Lukas Sandström (1):
30818 git-pack-redundant: speed and memory usage improvements
30821 git-daemon --base-path
30823 YOSHIFUJI Hideaki (1):
30824 GIT: Support [address] in URLs
30827 Add an optional limit to git-cherry
30828 Add a minimal test for git-cherry
30829 Add a test for rebase when a change was picked upstream
30832 Version v1.0.13; changes since v1.0.12:
30833 ---------------------------------------
30835 Junio C Hamano (1):
30836 checkout: do not make a temporary copy of symlink target.
30839 Version v1.0.12; changes since v1.0.11:
30840 ---------------------------------------
30842 Johannes Schindelin (1):
30843 git-fetch-pack: really do not ask for funny refs
30845 Junio C Hamano (1):
30846 Revert "check_packed_git_idx(): check integrity of the idx file itself."
30849 Version v1.0.11; changes since v1.0.10:
30850 ---------------------------------------
30852 Junio C Hamano (1):
30853 diffcore-break/diffcore-rename: integer overflow.
30856 Version v1.0.10; changes since v1.0.9:
30857 --------------------------------------
30859 J. Bruce Fields (1):
30860 Documentation: clarify fetch parameter descriptions.
30862 Junio C Hamano (5):
30863 update-index: work with c-quoted name
30864 name-rev: do not omit leading components of ref name.
30865 show-branch: handle [] globs as well.
30866 Documentation: git-commit -a
30867 Documentation: git-reset - interrupted workflow.
30870 Version v1.0.9; changes since v1.0.8:
30871 -------------------------------------
30873 Johannes Schindelin (1):
30874 glossary: explain "master" and "origin"
30877 Version v1.0.8; changes since v1.0.7:
30878 -------------------------------------
30881 Substitute "/" with $opt_s in tag names as well as branch names
30883 Junio C Hamano (7):
30884 unpack-objects: default to quiet if stderr is not a tty.
30885 Retire debian/ directory.
30886 prune: do not show error from pack-redundant when no packs are found.
30887 Compilation: zero-length array declaration.
30888 tar-tree: finish honoring extractor's umask in git-tar-tree.
30889 revert/cherry-pick: handle single quote in author name.
30890 mailsplit: allow empty input from stdin
30893 Teach cvsexportcommit to add new files
30894 Fix typo in debug stanza of t2001
30895 Fix git-format-patch usage string wrt output modes.
30898 Version v1.0.7; changes since v1.0.6:
30899 -------------------------------------
30902 trivial: retval of waitpid is not errno
30903 trivial: O_EXCL makes O_TRUNC redundant
30904 fix potential deadlock in create_one_file
30905 use result of open(2) to check for presence
30906 trivial: typo in git-commit.sh
30907 trivial: clarify, what are the config's user.name and user.email about
30908 trivial: remove the dots at the end of file names from merge-one-file
30909 trivial: use git-repo-config to detect if the test can be run on the repository
30910 trivial: use git-repo-config to detect how to run tests in the test repository
30911 trivial: .gitignore precompiled python modules
30912 trivial: check, if t/trash directory was successfully created
30913 use GIT_DIR instead of /var/tmp
30915 Amos Waterland (1):
30916 AIX compile fix for repo-config.c
30918 Andreas Ericsson (1):
30919 git: grok 'help' to mean '--help'.
30922 svnimport: support repositories requiring SSL authentication
30923 Documentation/git-svnimport: document -T and -t switches correctly
30926 Fix skipping merge-order test with NO_OPENSSL=1.
30929 Fix git-symbolic-ref typo in git.txt.
30932 git-init-db(1): Describe --shared and the idempotent nature of init-db
30933 Wrap synopsis lines and use [verse] to keep formatting
30935 Junio C Hamano (6):
30936 Documentation: spell.
30937 code comments: spell
30938 ?alloc: do not return NULL when asked for zero bytes
30939 git-fetch --tags: reject malformed tags.
30940 format-patch/commit: Quote single quote in the author name properly.
30941 t3300: skip when filesystem does not like TAB in filenames.
30943 Linus Torvalds (1):
30944 Fix nasty approxidate bug
30947 Version v1.0.6; changes since v1.0.5:
30948 -------------------------------------
30950 Junio C Hamano (3):
30951 Guard a test against wc that pads its output with whitespace
30952 Fix bogus tests on rev-list output.
30953 Do not mark tags fetched via --tags flag as mergeable
30956 copy_fd: close ifd on error
30959 Version v1.0.5; changes since v1.0.4:
30960 -------------------------------------
30963 short circuit out of a few places where we would allocate zero bytes
30965 Johannes Schindelin (1):
30966 Handle symlinks graciously
30968 Junio C Hamano (2):
30969 avoid asking ?alloc() for zero bytes.
30970 t5300: avoid false failures.
30973 Version v1.0.4; changes since v1.0.3:
30974 -------------------------------------
30976 Junio C Hamano (5):
30977 check_packed_git_idx(): check integrity of the idx file itself.
30978 show-branch: usability updates.
30979 merge --no-commit: tweak message
30980 ls-files --full-name: usage string and documentation.
30981 mailinfo: iconv does not like "latin-1" -- should spell it "latin1"
30984 Version v1.0.3; changes since v1.0.2:
30985 -------------------------------------
30988 \n usage in stderr output
30990 Johannes Schindelin (2):
30991 git-format-patch should show the correct version
30992 sha1_to_hex: properly terminate the SHA1
30994 Junio C Hamano (1):
30995 send-pack: reword non-fast-forward error message.
30997 Nick Hengeveld (1):
30998 Fix for http-fetch from file:// URLs
31001 sanity check in add_packed_git()
31004 Version v1.0.2; changes since v1.0.1:
31005 -------------------------------------
31007 Junio C Hamano (1):
31008 server-info: skip empty lines.
31011 quote.c: Make loop control more readable.
31014 Version v1.0.1; changes since v1.0.0b:
31015 --------------------------------------
31018 Version v1.0.0b; changes since v1.0.0a:
31019 ---------------------------------------
31021 Junio C Hamano (1):
31022 server-info: skip empty lines.
31025 quote.c: Make loop control more readable.
31028 Version v1.0.0a; changes since v1.0.0:
31029 --------------------------------------
31031 Johannes Schindelin (1):
31032 Avoid misleading success message on error
31034 Junio C Hamano (3):
31035 objects/info/packs: work around bug in http-fetch.c::fetch_indices()
31036 http-fetch.c: fix objects/info/pack parsing.
31040 An off-by-one bug found by valgrind
31043 Version v1.0.0; changes since v1.0rc6:
31044 --------------------------------------
31047 Documentation/git-archimport: document -o, -a, f, -D options
31049 Fredrik Kuivinen (3):
31050 git-diff: Usage string clean-up
31051 git-log: Add usage string
31052 git-whatchanged: Add usage string
31057 Johannes Schindelin (1):
31058 We do not like "HEAD" as a new branch name
31060 Junio C Hamano (32):
31061 clone-pack: make it usable for partial branch cloning.
31062 Documentation: tutorial
31063 get_sha1_basic(): corner case ambiguity fix
31065 Sort globbed refname in show-branch.
31066 refs.c: off-by-one fix.
31067 Examples of resetting.
31068 Forbid pattern maching characters in refnames.
31070 Documentation: HTTP needs update-server-info.
31071 Remove misguided branch disambiguation.
31072 Revert "refs.c: off-by-one fix."
31073 Revert "We do not like "HEAD" as a new branch name"
31074 Revert "get_sha1_basic(): corner case ambiguity fix"
31075 fetch-pack: -k option to keep downloaded pack.
31076 clone-pack: remove unused and undocumented --keep flag
31077 Documentation: typos and small fixes in "everyday".
31078 howto/using-topic-branches: Recommend public URL git://git.kernel.org/
31079 rev-list --objects: fix object list without commit.
31080 Documentation: stdout of update-hook is connected to /dev/null
31081 Remove generated files */*.py[co]
31082 Remove unused cmd-rename.sh
31084 tests: make scripts executable
31085 xread/xwrite: do not worry about EINTR at calling sites.
31086 diff: --abbrev option
31087 diff --abbrev: document --abbrev=<n> form.
31088 format-patch: make sure header and body are separated.
31091 ce_smudge_racily_clean_entry: explain why it works.
31092 A shared repository should be writable by members.
31094 Linus Torvalds (3):
31095 Make "git help" react to window size correctly
31096 Make "git help" sort git commands in columns
31097 Make "git-send-pack" less verbose by default
31099 Martin Langhoff (1):
31100 svnimport: exit cleanly when we are up to date
31103 small cleanup for diff-delta.c
31106 Version v1.0rc6; changes since v1.0rc5:
31107 ---------------------------------------
31109 Amos Waterland (1):
31110 git rebase loses author name/email if given bad email address
31112 Fredrik Kuivinen (12):
31113 Usage message clean-up, take #2
31114 Trivial usage string clean-up
31115 git-verify-tag: Usage string clean-up, emit usage string at incorrect invocation
31116 git-revert: Usage string clean-up
31117 git-am: Usage string clean-up
31118 git-applypatch: Usage string clean-up, emit usage string at incorrect invocation
31119 git-cherry: Usage string clean-up, use the 'usage' function
31120 git-fetch: Usage string clean-up, emit usage string at unrecognized option
31121 git-lost-found: Usage string clean-up, emit usage string at incorrect invocation
31122 git-prune: Usage string clean-up, use the 'usage' function
31123 git-rebase: Usage string clean-up, emit usage string at incorrect invocation
31124 git-repack: Usage string clean-up, emit usage at incorrect invocation
31126 H. Peter Anvin (1):
31127 git-am support for naked email messages (take 2)
31129 Junio C Hamano (22):
31130 diffcore-break.c: check diff_delta() return value.
31131 Add deltifier test.
31132 diff-delta.c: allow delta with empty blob.
31133 Everyday: some examples.
31134 Revert "diff-delta.c: allow delta with empty blob."
31135 Revert "Add deltifier test."
31136 diffcore-break: do not break too small filepair.
31137 Everyday: a bit more example.
31138 Documentation: more examples.
31139 Documentation: fix missing links to git(7)
31140 Documentation: diff examples.
31141 Documentation: not learning core git commands.
31142 git-clone: tell the user a bit more about clone-pack failure.
31143 allow merging any committish
31144 checkout-index: fix checking out specific path.
31145 Everyday: a bit more examples.
31146 t3200: branch --help does not die anymore.
31147 applypatch: no need to do non-portable [[ ... ]]
31148 Documentation: topic branches
31149 rebase: do not get confused in fast-forward situation.
31150 Do not let errors pass by unnoticed when running `make check'.
31151 mailinfo and git-am: allow "John Doe <johndoe>"
31153 Lukas Sandström (1):
31154 Bugfixes for git-rebase
31156 Martin Atukunda (1):
31157 define MAXPATHLEN for hosts that don't support it
31160 Make git-send-pack exit with error when some refs couldn't be pushed out
31163 Version v1.0rc5; changes since v1.0rc4:
31164 ---------------------------------------
31167 use "git init-db" in tests
31169 Daniel Barkalow (3):
31170 Warn when send-pack does nothing
31171 Clean up file descriptors when calling hooks.
31172 Allow saving an object from a pipe
31175 archimport: first, make sure it still compiles
31176 archimport: remove String::ShellQuote dependency.
31177 archimport: fix -t tmpdir switch
31178 archimport: remove git wrapper dependency
31179 archimport: add -D <depth> and -a switch
31180 archimport: safer log file parsing
31181 archimport: Add the accurate changeset applyer
31182 archimport: Fix a bug I introduced in the new log parser
31183 archimport: fix a in new changeset applyer addition
31186 Document config.mak in INSTALL.
31187 Initial AIX portability fixes.
31188 Use printf rather than echo -n.
31191 Added documentation for few missing options.
31193 Junio C Hamano (51):
31194 compat/setenv: do not free what we fed putenv(3).
31195 git.c: two fixes, gitsetenv type and off-by-one error.
31196 show-branch: allow glob pattern to name branches to show.
31197 Documentation: rebase does not use cherry-pick anymore.
31198 struct tree: remove unused field "parent"
31199 git.c: remove excess output for debugging when command is too long.
31200 sha1_file.c: make sure packs in an alternate odb is named properly.
31201 server-info.c: drop unused D lines.
31202 server-info: stop sorting packs by latest date.
31203 server-info: throw away T computation as well.
31204 Documentation: talk about pathspec in bisect.
31205 Documentation: git-mv manpage workaround.
31206 Documentation: git-diff asciidoc table workaround.
31207 Documentation: push/receive hook references.
31208 Documentation: shared repository management in tutorial.
31209 server-info.c: use pack_local like everybody else.
31210 server-info.c: and two functions are not used anymore.
31211 config.c: remove unnecessary header in minimum configuration file.
31212 Clean up compatibility definitions.
31214 git-mv to work with Perl 5.6
31215 hash-object: -- and --help
31216 init-db: check extra arguments and complain.
31217 write-tree: check extra arguments and die but be a bit more helpful.
31218 Documentation: hash-object.
31219 Documentaiton (read-tree): update description of 3-way
31220 git-merge-one-file: resurrect leading path creation.
31221 qsort() ptrdiff_t may be larger than int
31222 checkout-index: allow checking out from higher stages.
31223 git-merge-one: new merge world order.
31224 update-index: allow --index-info to add higher stages.
31225 Documentation: git.html/git.7
31226 Documentation(glossary): minor formatting clean-ups.
31227 Documentation(cvs-migration): minor cleanups.
31228 Documentation(tutorial): adjust merge example to the new merge world order.
31229 refs.c: make sure leading directories exist before writing a ref.
31230 Make sure we use compat/subprocess.py with Python 2.3 while running tests.
31231 Documentation: recursive is the default strategy these days.
31232 show-branch: comment typo
31233 Documentation: git-prune
31234 qsort(): ptrdiff_t may be larger than int
31235 git-prune: never lose objects reachable from our refs.
31236 Use GIT_EXEC_PATH explicitly for initial git-init-db in tests.
31237 Everyday GIT with 20 commands
31238 Link Everyday GIT to main documentation tree.
31239 t3300: funny name test
31240 t0000: catch trivial pilot errors.
31241 format-patch: use same number of digits in numbers
31242 merge-recursive: leave unmerged entries in the index.
31243 merge-recursive: cleanup setIndexStages
31244 t/t6022: a new test for renaming merge.
31246 Nikolai Weibull (16):
31247 Document the --non-empty command-line option to git-pack-objects.
31248 Fix the description of --utf8 and --keep to git-am.
31249 Use uniform description for the '--' option.
31250 Documentation/git-commit.txt: Add long options and -- to documentation.
31251 Documentation/git-verify-pack.txt: added documentation for --.
31252 Documentation/git-cvsimport.txt: Fix a slight glitch in description heading.
31253 Documentation/git-cherry-pick: Add --replay and --no-commit.
31254 Add documentation for git-revert and git-cherry-pick.
31255 Add documentation for the --topo-order option to git-show-branch.
31256 Documentation/git-format-patch.txt: Add --signoff, --check, and long option-names.
31257 Documentation/git-ls-remote.txt: Add -h and -t.
31258 Documentation/git-repack.txt: Add -l and -n.
31259 Documentation/git-http-fetch.txt: Document the commit-id argument.
31260 Documentation/git-update-server-info.txt: Add -f alias for --force to documentation.
31261 Documentation/git-tag.txt: Fix the order of sections (DESCRIPTION should come before OPTIONS).
31262 Documentation/git-read-tree.txt: Add --reset to SYNOPSIS.
31264 Paul Mackerras (3):
31265 gitk: Factored out some common code into a new start_rev_list procedure
31266 gitk: Some improvements for the code for updating the display
31267 gitk: Work around Tcl's non-standard names for encodings
31270 Update the git-ls-tree documentation
31271 Document the --(no-)edit switch of git-revert and git-cherry-pick
31273 Sven Verdoolaege (1):
31274 gitk: add Update menu item.
31277 Version v1.0rc4; changes since v1.0rc3:
31278 ---------------------------------------
31281 Documentation/git-log.txt: trivial typo fix.
31284 speedup allocation in pack-redundant.c
31285 remove unused variable
31286 arguments cleanup and some formatting
31287 Add tests for git-mv in subdirectories
31288 git wrapper: more careful argument stuffing
31290 Alexander Litvinov (1):
31291 git-mv is not able to handle big directories
31293 Andreas Ericsson (13):
31294 git-daemon: --inetd implies --syslog
31295 C implementation of the 'git' program, take two.
31296 Update git(7) man-page for the C wrapper.
31297 git --help COMMAND brings up the git-COMMAND man-page.
31298 daemon.c: fix arg parsing bugs
31299 Library code for user-relative paths, take three.
31300 Server-side support for user-relative paths.
31301 Client side support for user-relative paths.
31302 Documentation update for user-relative paths.
31303 git-reset.txt: Small fix + clarifications.
31304 git-daemon support for user-relative paths.
31305 Introduce $(ALL_PROGRAMS) for 'all:' and 'install:' to operate on.
31306 cvsimport: Don't let local settings hinder cvs user-migration.
31309 remove shellquote usage for tags
31310 archimport: don't die on merge-base failure
31311 Disambiguate the term 'branch' in Arch vs git
31313 Frank Sorenson (1):
31314 gitk: Specify line hover font
31316 Fredrik Kuivinen (5):
31317 merge-recursive: Replace 'except:'
31318 git-merge: Exit with code 2 if no strategy was able to handle the merge.
31319 test-lib.sh: Add new function, test_expect_code
31320 New test case: merge with directory/file conflicts
31321 New test case: Criss-cross merge
31323 H. Peter Anvin (3):
31324 git-core-foo -> git-foo, except the core package
31325 rename/copy score parsing updates.
31326 A few more options for git-cat-file
31329 Fix typo in http-push.c
31332 Add compat/setenv.c, use in git.c.
31335 gitk: put braces around exprs
31337 Johannes Schindelin (13):
31338 Add config variable core.symrefsonly
31339 Fix tests with new git in C
31340 Give python a chance to find "backported" modules
31341 Add functions git_config_set() and git_config_set_multivar()
31342 Add git-config-set, a simple helper for scripts to set config variables
31343 Add documentation for git-config-set
31344 Add test case for git-config-set
31345 git-config-set: add more options
31346 git-config-set: support selecting values by non-matching regex
31347 git-config-set: Properly terminate strings with '\0'
31348 Allow hierarchical section names
31349 Rename git-config-set to git-repo-config
31350 Make git-mv work in subdirectories, too
31353 Fix typos and minor format issues.
31356 Fix git(1) link to git-index-pack
31358 Josef Weidendorfer (6):
31359 Fix git-mv for moving directories with 1 file
31360 git-mv: shrink usage, no usage on error
31361 git-mv: keep git index consistent with file system on failed rename
31362 git-mv: fully detect 'directory moved into itself'
31363 Small fixes in Documentation/git-mv.txt
31364 git-mv: follow -k request even on failing renames
31366 Junio C Hamano (108):
31367 Documentation: do not blindly run 'cat' .git/HEAD, or echo into it.
31368 diff: make default rename detection limit configurable.
31369 sha1_file.c::add_packed_git(): fix type mismatch.
31370 git wrapper: basic fixes.
31371 git-apply: fail if a patch cannot be applied.
31372 git-am: --resolved.
31373 apply: allow-binary-replacement.
31375 tests: binary diff application.
31376 Add approxidate test calls.
31377 Deal with binary diff output from GNU diff 2.8.7
31378 git-am: --binary; document --resume and --binary.
31379 git-prune: quote possibly empty $dryrun as parameter to test
31380 Cygwin *might* be helped with NO_MMAP
31381 Do not show .exe in git command list.
31382 git-branch: -f to forcibly reset branch head.
31383 Rewrite rebase to use git-format-patch piped to git-am.
31384 readrefs: grab all refs with one call to ls-remote.
31385 git-count-objects: dc replacement
31386 git-repack: do not do complex redundancy check.
31387 Documentation: rebase-from-internal minor updates.
31388 merge-one-file: remove empty directories
31389 merge-recursive::removeFile: remove empty directories
31390 http.c: reorder to avoid compilation failure.
31391 Do not DWIM in userpath library under strict mode.
31392 Documentation: add hooks/update example.
31393 merge-one-file: use rmdir -p
31394 Fix "do not DWIM" patch to enter_repo"
31395 Make sure heads/foo and tags/foo do not confuse things.
31396 Fix hooks/update template.
31397 format-patch: fix two-argument special case, and make it easier to pick single commits
31398 rename detection with -M100 means "exact renames only".
31399 tutorial: setting up a tree for subsystem maintainers
31400 daemon: further tweaks.
31402 Move diff.renamelimit out of default configuration.
31403 git-var: constness and globalness cleanup.
31404 pack-redundant: type cleanups.
31405 git-merge: make recursive the default strategy
31406 git-revert: make --edit default.
31407 Teach update-index to read from ls-tree.
31408 diff-tree: teach single-commit diff-tree to honour grafts
31409 config.c: avoid shadowing global.
31410 Prevent "git-commit -a path1 path2..."
31411 parse-remote and ls-remote clean-up.
31412 git-sh-setup: die if outside git repository.
31413 git-var: make it work in subdirectory.
31414 setup_git_directory: make sure GIT_DIR is a valid repository.
31415 git-sh-setup: move the repository check to a core program.
31416 shell.c: complain on insufficient arguments.
31417 name-rev: fix off-by-one error in --stdin.
31418 format-patch: output filename reported to stdout verbatim.
31419 Repository format version check.
31420 Check repository format version in enter_repo().
31421 init-db: check template and repository format.
31422 setup_git_directory(): check repository format version.
31423 Introduce i18n.commitencoding.
31424 mailinfo: allow -u to fall back on latin1 to utf8 conversion.
31425 mailinfo: Use i18n.commitencoding
31426 mailinfo: Do not use -u=<encoding>; say --encoding=<encoding>
31427 config.c: constness tightening to avoid compilation warning.
31428 gitk: Use i18n.commitencoding configuration item.
31429 git-mv: quote $src in regexp properly.
31430 rebase: one safety net, one bugfix and one optimization.
31431 name-rev: fix parent counting.
31432 Documentation: Describe merge operation a bit better.
31433 write_name_quoted(): make one of the path a counted string.
31434 ls-tree: Resurrect funny name quoting lost during rewrite.
31435 ls-tree: match the test to the new semantics.
31436 bisect: quote pathnames for eval safety.
31437 working from subdirectory: preparation
31438 git-apply: work from subdirectory.
31439 peek-remote: honor proxy config even from subdirectory.
31440 fsck-objects: work from subdirectory.
31441 checkout-index: work from subdirectory.
31442 hash-object: work within subdirectory.
31443 ls-tree: work from subdirectory.
31444 Make networking commands to work from a subdirectory.
31445 Make the rest of commands work from a subdirectory.
31446 count-objects: make it operable from a subdirectory.
31447 ls-remote: define die() now we do not use git-sh-setup
31448 branch: make it operable from a subdirectory.
31449 lost-found: make it operable from a subdirectory.
31450 tag: make it operable from a subdirectory.
31451 verify-tag: make it operable from a subdirectory.
31452 define die() for scripts that use it.
31453 hash-object.c: type-fix to squelch compiler warnings.
31454 applymbox: typofix to enable -m option.
31455 applypatch: use "index" lines not "applies-to".
31456 format-patch: remove applies-to.
31457 format-patch: do not abuse 3-dash marker line.
31458 format-patch: run diff in C locale
31459 git-diff: do not turn off -p/-M with any diff options.
31460 diff-files: show diffs with stage0 and unmerged stage at the same time.
31461 merge-recursive: match the unmerged index entry behaviour with merge-resolve
31462 Tutorial: adjust merge example to recursive strategy.
31463 Documentation: describe '-f' option to git-fetch.
31464 Makefile: say the default target upfront.
31465 ls-tree: resurrect '-d' to mean 'show trees only'
31466 ls-tree: --name-only
31467 git-merge-one-file: do not worry about 'rmdir -p' not removing directory.
31468 merge-recursive: adjust git-ls-tree use for the latest.
31469 t3100: add ls-tree -t and -d tests.
31470 merge-one-file: make sure we create the merged file.
31471 merge-one-file: make sure we do not mismerge symbolic links.
31472 git-merge documentation: conflicting merge leaves higher stages in index
31473 documentation: git-bisect (help HTML break man)
31474 daemon.c and path.enter_repo(): revamp path validation.
31477 git-cvsexportcommit.perl: Fix usage() output.
31478 git-cvsexportcommit.perl: use getopts to get binary flags
31479 git-cvsexportcommit.perl: exit with non-0 status if patch fails.
31480 git-cvsexportcommit.perl: fix typos in output
31482 Linus Torvalds (14):
31483 Disallow empty pattern in "git grep"
31484 git's rev-parse.c function show_datestring presumes gnu date
31485 Teach "approxidate" about weekday syntax
31486 Make "git fetch" less verbose by default
31487 Teach "approxidate" about weekday syntax
31488 git-repack: Properly abort in corrupt repository
31489 Allow editing of a revert-message
31490 ls-tree: major rewrite to do pathspec
31491 ls-tree: further cleanup to parallel ls-files.
31492 ls-tree: further tweaks of the rewrite
31493 bisect: limit the searchspace by pathspecs
31494 diff-files: -1/-2/-3 to diff against unmerged stage.
31495 merge-one-file: leave unmerged index entries upon automerge failure.
31496 git-ls-tree: add "-t" option to always show the tree entries
31499 max-count in terms of intersection
31501 Lukas Sandström (8):
31502 Fix llist_sorted_difference_inplace in git-pack-redundant
31503 Make git-pack-redundant non-horribly slow on large sets of packs
31504 Fix bug introduced by the latest changes to git-pack-redundant
31505 Fix a bug in get_all_permutations.
31506 Remove all old packfiles when doing "git repack -a -d"
31507 Improve the readability of git-pack-redundant
31508 Document the "ignore objects" feature of git-pack-redundant
31509 Make git-pack-redundant take a list of unimportant objs on stdin
31511 Martin Langhoff (1):
31512 archimport: allow for old style branch and public tag names
31514 Matthias Urlichs (1):
31515 SVN import: Use one log call
31517 Nick Hengeveld (7):
31518 Isolate shared HTTP request functionality
31519 Make http-fetch request types more clear
31520 Improve pack list response handling
31521 Improve XML parsing in http-push
31522 http-push memory/fd cleanup
31523 Decide whether to build http-push in the Makefile
31527 'make clean' forgot about some files
31530 proxy-command support for git://
31532 Paul Mackerras (5):
31533 Add -r flag and some speedups
31534 gitk: Fix some bugs introduced by speedup changes
31535 gitk: Disable fastdate stuff for now
31536 gitk: Fix diff this->selected and selected->this functions
31537 gitk: Add a preferences dialog with some basic stuff
31540 git-daemon not listening when compiled with -DNO_IPV6
31541 Fixed git:// IPv4 address problem when compiled with -DNO_IPV6.
31544 symref support for import scripts
31545 gitk: use git-diff-tree --no-commit-id
31546 gitk: UTF-8 support
31547 git-clone --shared should imply --local
31550 Fix bunch of fd leaks in http-fetch
31553 git-repack: Fix variable name
31556 Add Python version checks to the Makefile to automatically set WITH_OWN_SUBPROCESS_PY
31559 git-fsck-objects: Free tree entries after use
31560 Rework object refs tracking to reduce memory usage
31562 Stefan-W. Hahn (1):
31563 gitk: moving all three panes if clicking on an arrow.
31566 Fix sparse warnings
31567 Move couple of ifdefs after "include config.mk"
31569 Tommi Virtanen (1):
31570 Do not attempt to access literal dirname "GIT_OBJECT_DIRECTORY".
31573 Update pull/fetch --tags documentation
31575 YOSHIFUJI Hideaki (2):
31576 GIT: Fix compilation error in connect.c
31577 Fix a warning about unused value.
31580 Fix gitk this->selected diffs
31583 documentation: clarify read-tree --reset
31584 documentation: git-tag
31587 Version v1.0rc3; changes since v1.0rc2:
31588 ---------------------------------------
31590 Junio C Hamano (1):
31591 GIT 0.99.9j aka 1.0rc3
31594 Version v1.0rc2; changes since v1.0rc1:
31595 ---------------------------------------
31598 allow git-update-ref create refs with slashes in names
31600 Andreas Ericsson (1):
31601 git-branch: Mention -d and -D in man-page.
31603 Josef Weidendorfer (2):
31604 Bugfix: stop if directory already exists
31605 Remove git-rename. git-mv does the same
31607 Junio C Hamano (5):
31608 Debian: build-depend on libexpat-dev.
31609 Rename lost+found to lost-found.
31610 Separate LDFLAGS and CFLAGS.
31611 apply: fix binary patch detection.
31612 Update topo-order test.
31615 Fix compilation warnings in pack-redundant.c
31617 Linus Torvalds (1):
31618 Fix git-rev-list "date order" with --topo-order
31620 Matthias Urlichs (3):
31621 debian packaging: git-cvs needs cvsps
31622 Remove trailing slashes
31623 Depend on asciidoc 7 (at least).
31625 Nick Hengeveld (2):
31626 Fix for multiple alternates requests in http-fetch
31627 Fix fd leak in http-fetch
31629 Nikolai Weibull (3):
31630 Document the -n command-line option to git-unpack-objects
31631 Document a couple of missing command-line options.
31632 Documentation nitpicking
31634 Thomas Matysik (2):
31635 Add expat and expat-devel dependencies (for http-push) to RPM spec.
31636 Split gitk into seperate RPM package