Skip to content
Snippets Groups Projects
  1. Mar 28, 2018
    • Thomas Gummerer's avatar
      git-stash.txt: remove extra square bracket · 0a790f09
      Thomas Gummerer authored
      
      In 1ada5020 ("stash: use stash_push for no verb form", 2017-02-28),
      when the pathspec argument was introduced in 'git stash', that was also
      documented.  However I forgot to remove an extra square bracket after
      the '--message' argument, even though the square bracket should have
      been after the pathspec argument (where it was also added).
      
      Remove the extra square bracket after the '--message' argument, to show
      that the pathspec argument should be used with the 'push' verb.
      
      While the pathspec argument can be used without the push verb, that's a
      special case described later in the man page, and removing the first extra
      square bracket instead of the second one makes the synopis easier to
      understand.
      
      Signed-off-by: default avatarThomas Gummerer <t.gummerer@gmail.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      0a790f09
  2. Mar 22, 2018
  3. Feb 27, 2018
    • Junio C Hamano's avatar
      Merge branch 'ys/bisect-object-id-missing-conversion-fix' into maint · 38e79b1f
      Junio C Hamano authored
      Fix for a commented-out code to adjust it to a rather old API change.
      
      * ys/bisect-object-id-missing-conversion-fix:
        bisect: debug: convert struct object to object_id
      38e79b1f
    • Junio C Hamano's avatar
      Merge branch 'sb/submodule-update-reset-fix' into maint · 14890e91
      Junio C Hamano authored
      When resetting the working tree files recursively, the working tree
      of submodules are now also reset to match.
      
      * sb/submodule-update-reset-fix:
        submodule: submodule_move_head omits old argument in forced case
        unpack-trees: oneway_merge to update submodules
        t/lib-submodule-update.sh: fix test ignoring ignored files in submodules
        t/lib-submodule-update.sh: clarify test
      14890e91
    • Junio C Hamano's avatar
      Merge branch 'ab/commit-m-with-fixup' into maint · c1ab3b8a
      Junio C Hamano authored
      "git commit --fixup" did not allow "-m<message>" option to be used
      at the same time; allow it to annotate resulting commit with more
      text.
      
      * ab/commit-m-with-fixup:
        commit: add support for --fixup <commit> -m"<extra message>"
        commit doc: document that -c, -C, -F and --fixup with -m error
      c1ab3b8a
    • Junio C Hamano's avatar
      Merge branch 'nd/ita-wt-renames-in-status' into maint · 12accdc0
      Junio C Hamano authored
      "git status" after moving a path in the working tree (hence making
      it appear "removed") and then adding with the -N option (hence
      making that appear "added") detected it as a rename, but did not
      report the  old and new pathnames correctly.
      
      * nd/ita-wt-renames-in-status:
        wt-status.c: handle worktree renames
        wt-status.c: rename rename-related fields in wt_status_change_data
        wt-status.c: catch unhandled diff status codes
        wt-status.c: coding style fix
        Use DIFF_DETECT_RENAME for detect_rename assignments
        t2203: test status output with porcelain v2 format
      12accdc0
  4. Feb 22, 2018
Loading