Skip to main content

Browse the archive

Revision 2d436678a70c118bc2683b8d81131459e602a1d7 authored by Junio C Hamano on 06 February 2021, 00:31:27 UTC, committed by Junio C Hamano on 06 February 2021, 00:31:28 UTC 
Merge branch 'jk/log-cherry-pick-duplicate-patches' into maint
 
When more than one commit with the same patch ID appears on one
side, "git log --cherry-pick A...B" did not exclude them all when a
commit with the same patch ID appears on the other side.  Now it
does.

* jk/log-cherry-pick-duplicate-patches:
  patch-ids: handle duplicate hashmap entries
2 parent s 635ff67 + c9e3a4e
Raw File
reset.h 
#ifndef RESET_H
#define RESET_H

#include "hash.h"
#include "repository.h"

#define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION"

#define RESET_HEAD_DETACH (1<<0)
#define RESET_HEAD_HARD (1<<1)
#define RESET_HEAD_RUN_POST_CHECKOUT_HOOK (1<<2)
#define RESET_HEAD_REFS_ONLY (1<<3)
#define RESET_ORIG_HEAD (1<<4)

int reset_head(struct repository *r, struct object_id *oid, const char *action,
	       const char *switch_to_branch, unsigned flags,
	       const char *reflog_orig_head, const char *reflog_head,
	       const char *default_reflog_action);

#endif
back to top